| commit | b99a9e8776ca837344c6b64d518483fc5d5eefb4 | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@linux-foundation.org> | Fri May 20 19:16:12 2016 -0700 |
| committer | Linus Torvalds <torvalds@linux-foundation.org> | Fri May 20 19:16:12 2016 -0700 |
| tree | 66f7534e7bc008f21cb493a706d3d3a670aa12f5 | |
| parent | be1332c0994fbf016fa4ef0f0c4acda566fe6cb3 [diff] | |
| parent | 48a77aa7e20557319205f9bd4cc02d4b67b5f761 [diff] |
Merge branch 'for-next' of git://git.samba.org/sfrench/cifs-2.6 Pull cifs fixes from Steve French: "Two small cifs fixes, including one spnego upcall cifs security fix for stable" * 'for-next' of git://git.samba.org/sfrench/cifs-2.6: CIFS: Remove some obsolete comments cifs: Create dedicated keyring for spnego operations