]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
Merge remote-tracking branch 'userns/for-next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Fri, 2 Aug 2013 07:05:41 +0000 (17:05 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Fri, 2 Aug 2013 07:05:41 +0000 (17:05 +1000)
1  2 
fs/proc/root.c

diff --cc fs/proc/root.c
Simple merge