From: Linus Torvalds Date: Wed, 27 Aug 2008 21:34:49 +0000 (-0700) Subject: Merge git://git.kernel.org/pub/scm/linux/kernel/git/sfrench/cifs-2.6 X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=325a9a3d3990e77c62b771a71239fcd0cb6f6e2c;p=linux-beck.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] Add destroy routine for dns_resolver [CIFS] Reorder cifs config item for better clarity [CIFS] Correct keys dependency for cifs kerberos support --- 325a9a3d3990e77c62b771a71239fcd0cb6f6e2c