tree 69227df9ed9e9652c86033872350c1f7ad6e3522
parent 189e7cc1e092a31183febe598f8e37385ff9936e
parent f7b2e8c76b3423a1d2501b9399261e9c9a33e100
author Linus Torvalds <torvalds@g5.osdl.org> 1163434189 -0800
committer Linus Torvalds <torvalds@g5.osdl.org> 1163434189 -0800

Merge master.kernel.org:/pub/scm/linux/kernel/git/sfrench/cifs-2.6

* master.kernel.org:/pub/scm/linux/kernel/git/sfrench/cifs-2.6:
  [CIFS] Fix minor problem with previous patch
  [CIFS]  Fix mount failure when domain not specified
  [CIFS] Explicitly set stat->blksize
  [CIFS] NFS stress test generates flood of "close with pending write" messages