tree 0b0200a5f5fbfc9da8ce34230b19c625135d27a4
parent 895663cd92574367054e0eb604a7428852f359b8
parent 8e87d4dc159148f04f515bc072df22a2c089e7f2
author Linus Torvalds <torvalds@g5.osdl.org> 1162516944 -0800
committer Linus Torvalds <torvalds@g5.osdl.org> 1162516944 -0800

Merge git://git.kernel.org/pub/scm/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