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

diff --cc fs/cifs/dir.c
Simple merge
Simple merge