commit 9f6632d6290785caf9e9f874c0a0cfaf2c178e59
author Linus Torvalds <torvalds@woody.linux-foundation.org> Tue Mar 06 17:32:22 2007 -0800
committer Linus Torvalds <torvalds@woody.linux-foundation.org> Tue Mar 06 17:32:22 2007 -0800
tree 2757e79374b98211170782c1ff8d15b8532492b7
parent 8328258e745b80290534c9ab5bede6cd8340ea75
parent 8a236264f7d6db3f52881d37a86c5a5f704072b0

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] cifs_prepare_write was incorrectly rereading page in some cases
  [CIFS] Fix set file size to zero when doing chmod to Samba 3.0.26pre
  [CIFS] Remove some unused functions/declarations
  [CIFS] New file for previous commit
  [CIFS] cifs export operations
  [CIFS] small piece missing from previous patch
  [CIFS] Fix locking problem around some cifs uses of i_size write