]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
Merge remote-tracking branch 'jfs/next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Tue, 26 Jul 2011 02:11:13 +0000 (12:11 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Tue, 26 Jul 2011 02:11:13 +0000 (12:11 +1000)
1  2 
fs/jfs/namei.c

diff --cc fs/jfs/namei.c
Simple merge