From: Linus Torvalds Date: Tue, 26 Aug 2008 17:36:33 +0000 (-0700) Subject: Merge git://git.kernel.org/pub/scm/linux/kernel/git/sfrench/cifs-2.6 X-Git-Tag: v2.6.27-rc5~27 X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=b22dfb735a019a721117e713968c1ddf60ee6142;p=linux-2.6-omap-h63xx.git 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 --- b22dfb735a019a721117e713968c1ddf60ee6142