tree e2c488ad8a634812459fd733f87b673ccf1977d6
parent ca81a62198e39ad9155f12725c269fcc2a9f1f8b
parent ff4fa4a25a33f92b5653bb43add0c63bea98d464
author Linus Torvalds <torvalds@linux-foundation.org> 1329194084 -0800
committer Linus Torvalds <torvalds@linux-foundation.org> 1329194084 -0800

Merge git://git.samba.org/sfrench/cifs-2.6

* git://git.samba.org/sfrench/cifs-2.6:
  cifs: don't return error from standard_receive3 after marking response malformed
  cifs: request oplock when doing open on lookup
  cifs: fix error handling when cifscreds key payload is an error