Merge git://git.kernel.org/pub/scm/linux/kernel/git/sfrench/cifs-2.6
authorLinus Torvalds <torvalds@linux-foundation.org>
Wed, 27 Aug 2008 21:34:49 +0000 (14:34 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Wed, 27 Aug 2008 21:34:49 +0000 (14:34 -0700)
commit325a9a3d3990e77c62b771a71239fcd0cb6f6e2c
tree5f5a1b61f2730d61b94924cb1f9297d976260a0f
parente4268bd3b2b0380faaa62fad3e8d705eea21d124
parent87ed1d65fb536a0cd4e84874c0b038f953e448aa
Merge git://git./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