Merge git://git.samba.org/sfrench/cifs-2.6
authorLinus Torvalds <torvalds@linux-foundation.org>
Tue, 14 Feb 2012 04:34:44 +0000 (20:34 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Tue, 14 Feb 2012 04:34:44 +0000 (20:34 -0800)
commitce5afed937f0a823d3b00c9459409c3f5f2fbd5d
treee2c488ad8a634812459fd733f87b673ccf1977d6
parentca81a62198e39ad9155f12725c269fcc2a9f1f8b
parentff4fa4a25a33f92b5653bb43add0c63bea98d464
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