Merge branch 'd_real' into overlayfs-next

author Miklos Szeredi <[email protected]>

Wed, 27 Jul 2016 09:36:03 +0000 (11:36 +0200)

committer Miklos Szeredi <[email protected]>

Wed, 27 Jul 2016 09:36:03 +0000 (11:36 +0200)
author Miklos Szeredi <[email protected]>
Wed, 27 Jul 2016 09:36:03 +0000 (11:36 +0200)
committer Miklos Szeredi <[email protected]>
Wed, 27 Jul 2016 09:36:03 +0000 (11:36 +0200)
diff --cc fs/overlayfs/inode.c
Simple merge
diff --cc fs/overlayfs/overlayfs.h
Simple merge
diff --cc fs/overlayfs/super.c
Simple merge
author	Miklos Szeredi <[email protected]>
	Wed, 27 Jul 2016 09:36:03 +0000 (11:36 +0200)
committer	Miklos Szeredi <[email protected]>
	Wed, 27 Jul 2016 09:36:03 +0000 (11:36 +0200)
		1	2
fs/overlayfs/inode.c	patch \|	diff1 \|	diff2 \|	blob \| history
fs/overlayfs/overlayfs.h	patch \|	diff1 \|	diff2 \|	blob \| history
fs/overlayfs/super.c	patch \|	diff1 \|	diff2 \|	blob \| history