diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-08-26 10:36:33 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-08-26 10:36:33 -0700 |
| commit | b22dfb735a019a721117e713968c1ddf60ee6142 (patch) | |
| tree | e3b283a8413befe094fee0841fb96ef3b7ccce1d /include/linux/net.h | |
| parent | bd5a54e93c4d26509dca13d2f4f54d220558a012 (diff) | |
| parent | 3dae49abef945c55c10fa7c479cfd8fd13af55db (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/sfrench/cifs-2.6
* git://git.kernel.org/pub/scm/linux/kernel/git/sfrench/cifs-2.6:
[CIFS] check version in spnego upcall response
[CIFS] Kerberos support not considered experimental anymore
[CIFS] distinguish between Kerberos and MSKerberos in upcall
cifs: add local server pointer to cifs_setup_session
[CIFS] reindent misindented statement
Diffstat (limited to 'include/linux/net.h')
0 files changed, 0 insertions, 0 deletions