]> git.kernelconcepts.de Git - karo-tx-linux.git/commitdiff
Merge remote-tracking branch 'userns/for-next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Thu, 16 Jan 2014 05:24:27 +0000 (16:24 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Thu, 16 Jan 2014 05:24:27 +0000 (16:24 +1100)
1  2 
fs/dcache.c
fs/namespace.c
kernel/fork.c

diff --cc fs/dcache.c
Simple merge
diff --cc fs/namespace.c
Simple merge
diff --cc kernel/fork.c
Simple merge