diff options
| author |   Linus Torvalds <torvalds@linux-foundation.org> | 2010-08-13 10:37:30 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-08-13 10:37:30 -0700 |
| commit | 2897c684d1d5140e0e0302e73660c7cb97981b27 (patch) | |
| tree | 8132776c20aeaa8ec6703ea782afd44ffc76e3ce /include | |
| parent | Merge branch 'x86/urgent' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip (diff) | |
| parent | [NFS] Set CONFIG_KEYS when CONFIG_NFS_USE_KERNEL_DNS is set (diff) | |
| download | linux-dev-2897c684d1d5140e0e0302e73660c7cb97981b27.tar.xz linux-dev-2897c684d1d5140e0e0302e73660c7cb97981b27.zip | |
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:
[NFS] Set CONFIG_KEYS when CONFIG_NFS_USE_KERNEL_DNS is set
AFS: Implement an autocell mount capability [ver #2]
DNS: If the DNS server returns an error, allow that to be cached [ver #2]
NFS: Use kernel DNS resolver [ver #2]
cifs: update README to include details about 'fsc' option
Diffstat (limited to 'include')
0 files changed, 0 insertions, 0 deletions