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

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