Merge remote-tracking branch 'userns/for-next'

author Stephen Rothwell <sfr@canb.auug.org.au>

Mon, 6 Jan 2014 08:20:47 +0000 (19:20 +1100)

committer Stephen Rothwell <sfr@canb.auug.org.au>

Mon, 6 Jan 2014 08:20:47 +0000 (19:20 +1100)
author Stephen Rothwell <sfr@canb.auug.org.au>
Mon, 6 Jan 2014 08:20:47 +0000 (19:20 +1100)
committer Stephen Rothwell <sfr@canb.auug.org.au>
Mon, 6 Jan 2014 08:20:47 +0000 (19:20 +1100)
diff --cc fs/dcache.c
Simple merge
diff --cc fs/namespace.c
Simple merge
diff --cc kernel/fork.c
Simple merge
author	Stephen Rothwell <sfr@canb.auug.org.au>
	Mon, 6 Jan 2014 08:20:47 +0000 (19:20 +1100)
committer	Stephen Rothwell <sfr@canb.auug.org.au>
	Mon, 6 Jan 2014 08:20:47 +0000 (19:20 +1100)
		1	2
fs/dcache.c	patch \|	diff1 \|	diff2 \|	blob \| history
fs/namespace.c	patch \|	diff1 \|	diff2 \|	blob \| history
kernel/fork.c	patch \|	diff1 \|	diff2 \|	blob \| history