Merge master.kernel.org:/pub/scm/linux/kernel/git/sfrench/cifs-2.6
commit9654640d0af8f2de40ff3807d3695109d3463f54
authorLinus Torvalds <torvalds@woody.linux-foundation.org>
Wed, 21 Feb 2007 21:02:17 +0000 (21 13:02 -0800)
committerLinus Torvalds <torvalds@woody.linux-foundation.org>
Wed, 21 Feb 2007 21:02:17 +0000 (21 13:02 -0800)
treeab279cb78248152fe19d3d2a977f33f883abed40
parentb5bf28cde894b3bb3bd25c13a7647020562f9ea0
parent004c46b9e588edf549a39c5db54e37ebd0b3b3ad
Merge /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()