]> git.baikalelectronics.ru Git - kernel.git/commit
Merge master.kernel.org:/pub/scm/linux/kernel/git/sfrench/cifs-2.6
authorLinus Torvalds <torvalds@woody.linux-foundation.org>
Wed, 21 Feb 2007 21:02:17 +0000 (13:02 -0800)
committerLinus Torvalds <torvalds@woody.linux-foundation.org>
Wed, 21 Feb 2007 21:02:17 +0000 (13:02 -0800)
commit5031461c81a032779c779cda5a7ac1f3aef73100
treeab279cb78248152fe19d3d2a977f33f883abed40
parent514a1641c24958be21f019e85e0cbc437c22b129
parentfd3f68e6e7daded0823be41ef4cd7da6a3d8d510
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()