]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
Merge remote-tracking branch 'ext4/dev'
authorStephen Rothwell <sfr@canb.auug.org.au>
Mon, 18 Feb 2013 00:16:12 +0000 (11:16 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Mon, 18 Feb 2013 00:16:12 +0000 (11:16 +1100)
1  2 
fs/ext4/namei.c

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