]> err.no Git - linux-2.6/commit
projects / linux-2.6 / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: bd5a54e 3dae49a)
Merge git://git.kernel.org/pub/scm/linux/kernel/git/sfrench/cifs-2.6
authorLinus Torvalds <torvalds@linux-foundation.org>
Tue, 26 Aug 2008 17:36:33 +0000 (10:36 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Tue, 26 Aug 2008 17:36:33 +0000 (10:36 -0700)
commitb22dfb735a019a721117e713968c1ddf60ee6142
treee3b283a8413befe094fee0841fb96ef3b7ccce1dtree | snapshot
parentbd5a54e93c4d26509dca13d2f4f54d220558a012commit | diff
parent3dae49abef945c55c10fa7c479cfd8fd13af55dbcommit | 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
Linux 2.6 source tree