]> git.kernelconcepts.de Git - karo-tx-linux.git/commitdiff
Merge remote-tracking branch 'namespace/master'
authorStephen Rothwell <sfr@canb.auug.org.au>
Wed, 16 Nov 2011 01:12:41 +0000 (12:12 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Wed, 16 Nov 2011 01:12:41 +0000 (12:12 +1100)
1  2 
fs/proc/inode.c

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