| commit | 9217cbb8df31c10efc96362227b2ebdbb9fe996c | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@linux-foundation.org> | Thu Mar 21 17:59:22 2013 -0700 |
| committer | Linus Torvalds <torvalds@linux-foundation.org> | Thu Mar 21 17:59:22 2013 -0700 |
| tree | 9cb7a5daf362fd4847756f6f3f75c7e0966ff903 | |
| parent | d3c926264a92e5ea448add3e883530e1edad3ce2 [diff] | |
| parent | f853c616883a8de966873a1dab283f1369e275a1 [diff] |
Merge branch 'for-next' of git://git.samba.org/sfrench/cifs-2.6 Pull CIFS fixes from Steve French: "Three small CIFS Fixes (the most important of the three fixes a recent problem authenticating to Windows 8 using cifs rather than SMB2)" * 'for-next' of git://git.samba.org/sfrench/cifs-2.6: cifs: ignore everything in SPNEGO blob after mechTypes cifs: delay super block destruction until all cifsFileInfo objects are gone cifs: map NT_STATUS_SHARING_VIOLATION to EBUSY instead of ETXTBSY