]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
Merge remote-tracking branch 'namespace/master'
authorStephen Rothwell <sfr@canb.auug.org.au>
Thu, 24 Nov 2011 04:38:14 +0000 (15:38 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Thu, 24 Nov 2011 04:38:14 +0000 (15:38 +1100)
1  2 
fs/proc/inode.c

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