tree 5f5a1b61f2730d61b94924cb1f9297d976260a0f
parent e4268bd3b2b0380faaa62fad3e8d705eea21d124
parent 87ed1d65fb536a0cd4e84874c0b038f953e448aa
author Linus Torvalds <torvalds@linux-foundation.org> 1219872889 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1219872889 -0700

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