Merge git://git.kernel.org/pub/scm/linux/kernel/git/sfrench/cifs-2.6
authorLinus Torvalds <torvalds@woody.linux-foundation.org>
Fri, 23 Mar 2007 02:47:09 +0000 (19:47 -0700)
committerLinus Torvalds <torvalds@woody.linux-foundation.org>
Fri, 23 Mar 2007 02:47:09 +0000 (19:47 -0700)
commit70e403c2063b585faea091cb8b85a4821f76adad
tree85989e8d7a4d3b80086b70410907ba1bb1c62b14
parentb8c86d66b3b24dab897d177a9598b13fb1aa00f9
parent247832ce2bf554734d9480dbf60dad88928651bc
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] Allow reset of file to ATTR_NORMAL when archive bit not set
  [CIFS] Do not negotiate new POSIX_PATH_OPERATIONS_CAP yet
  [CIFS] reset mode when client notices that ATTR_READONLY is no longer set
fs/cifs/cifspdu.h