Merge branch 'overlayfs-af_unix-fix' into overlayfs-linus

author Miklos Szeredi <[email protected]>

Sun, 12 Jun 2016 10:05:21 +0000 (12:05 +0200)

committer Miklos Szeredi <[email protected]>

Sun, 12 Jun 2016 10:05:21 +0000 (12:05 +0200)
author Miklos Szeredi <[email protected]>
Sun, 12 Jun 2016 10:05:21 +0000 (12:05 +0200)
committer Miklos Szeredi <[email protected]>
Sun, 12 Jun 2016 10:05:21 +0000 (12:05 +0200)
diff --cc include/linux/dcache.h
Simple merge
diff --cc net/unix/af_unix.c
Simple merge
author	Miklos Szeredi <[email protected]>
	Sun, 12 Jun 2016 10:05:21 +0000 (12:05 +0200)
committer	Miklos Szeredi <[email protected]>
	Sun, 12 Jun 2016 10:05:21 +0000 (12:05 +0200)
		1	2
include/linux/dcache.h	patch \|	diff1 \|	diff2 \|	blob \| history
net/unix/af_unix.c	patch \|	diff1 \|	diff2 \|	blob \| history