]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
Merge remote-tracking branch 'namespace/master'
authorStephen Rothwell <sfr@canb.auug.org.au>
Fri, 9 Dec 2011 03:51:08 +0000 (14:51 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Fri, 9 Dec 2011 03:51:08 +0000 (14:51 +1100)
1  2 
fs/proc/inode.c

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