diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-08-27 14:34:49 -0700 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-08-27 14:34:49 -0700 |
commit | 325a9a3d3990e77c62b771a71239fcd0cb6f6e2c (patch) | |
tree | 5f5a1b61f2730d61b94924cb1f9297d976260a0f /drivers/media | |
parent | e4268bd3b2b0380faaa62fad3e8d705eea21d124 (diff) | |
parent | 87ed1d65fb536a0cd4e84874c0b038f953e448aa (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] Add destroy routine for dns_resolver
[CIFS] Reorder cifs config item for better clarity
[CIFS] Correct keys dependency for cifs kerberos support
Diffstat (limited to 'drivers/media')
0 files changed, 0 insertions, 0 deletions