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

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