Merge git://git.kernel.org/pub/scm/linux/kernel/git/sfrench/cifs-2.6
authorLinus Torvalds <torvalds@g5.osdl.org>
Fri, 3 Nov 2006 01:22:24 +0000 (17:22 -0800)
committerLinus Torvalds <torvalds@g5.osdl.org>
Fri, 3 Nov 2006 01:22:24 +0000 (17:22 -0800)
commit0b0e0b5f1a22c20c0f127fb9b457136d6c3ca8ed
tree0b0200a5f5fbfc9da8ce34230b19c625135d27a4
parent895663cd92574367054e0eb604a7428852f359b8
parent8e87d4dc159148f04f515bc072df22a2c089e7f2
Merge git://git./linux/kernel/git/sfrench/cifs-2.6

* git://git.kernel.org/pub/scm/linux/kernel/git/sfrench/cifs-2.6:
  [CIFS] report rename failure when target file is locked by Windows
  [CIFS] Allow null user connections
  [CIFS] Fix readdir breakage when blocksize set too small