From: Linus Torvalds <torvalds@woody.linux-foundation.org>
Date: Wed, 21 Feb 2007 21:02:17 +0000 (-0800)
Subject: Merge master.kernel.org:/pub/scm/linux/kernel/git/sfrench/cifs-2.6
X-Git-Tag: v2.6.21-rc2~63
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9654640d0af8f2de40ff3807d3695109d3463f54;p=linux-2.6

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()
---

9654640d0af8f2de40ff3807d3695109d3463f54