tree 85989e8d7a4d3b80086b70410907ba1bb1c62b14
parent 37c70d0d09747a958ec50aeb11ed1bf896da028c
parent 066fcb06d3e27c258bc229bb688ced2b16daa6c2
author Linus Torvalds <torvalds@woody.linux-foundation.org> 1174618029 -0700
committer Linus Torvalds <torvalds@woody.linux-foundation.org> 1174618029 -0700

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