]> err.no Git - linux-2.6/commitdiff
projects / linux-2.6 / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 551a10c 8af1897)
Merge master.kernel.org:/pub/scm/linux/kernel/git/sfrench/cifs-2.6
authorLinus Torvalds <torvalds@woody.linux-foundation.org>
Wed, 14 Feb 2007 05:15:42 +0000 (21:15 -0800)
committerLinus Torvalds <torvalds@woody.linux-foundation.org>
Wed, 14 Feb 2007 05:15:42 +0000 (21:15 -0800)
* master.kernel.org:/pub/scm/linux/kernel/git/sfrench/cifs-2.6:
  [CIFS] on reconnect to Samba - reset the unix capabilities
  [CIFS] Allow update of EOF on remote extend of file
  [CIFS] POSIX CIFS Extensions (continued) - POSIX Open
  [CIFS] Additional POSIX CIFS Extensions infolevels

1  2 
fs/Kconfig patch | diff1 | diff2 | blob | history
fs/cifs/cifsfs.h patch | diff1 | diff2 | blob | history

diff --cc fs/Kconfig
Simple merge
diff --cc fs/cifs/cifsfs.h
Simple merge
Linux 2.6 source tree