tree ab279cb78248152fe19d3d2a977f33f883abed40
parent b5bf28cde894b3bb3bd25c13a7647020562f9ea0
parent 004c46b9e588edf549a39c5db54e37ebd0b3b3ad
author Linus Torvalds <torvalds@woody.linux-foundation.org> 1172091737 -0800
committer Linus Torvalds <torvalds@woody.linux-foundation.org> 1172091737 -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] One line missing from previous commit
  [CIFS] mtime bounces from local to remote when cifs nocmtime i_flags overwritten
  [CIFS] fix &&/& typo in cifs_setattr()