| commit | ce5afed937f0a823d3b00c9459409c3f5f2fbd5d | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@linux-foundation.org> | Mon Feb 13 20:34:44 2012 -0800 |
| committer | Linus Torvalds <torvalds@linux-foundation.org> | Mon Feb 13 20:34:44 2012 -0800 |
| tree | e2c488ad8a634812459fd733f87b673ccf1977d6 | |
| parent | ca81a62198e39ad9155f12725c269fcc2a9f1f8b [diff] | |
| parent | ff4fa4a25a33f92b5653bb43add0c63bea98d464 [diff] |
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