| commit | 2897c684d1d5140e0e0302e73660c7cb97981b27 | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@linux-foundation.org> | Fri Aug 13 10:37:30 2010 -0700 |
| committer | Linus Torvalds <torvalds@linux-foundation.org> | Fri Aug 13 10:37:30 2010 -0700 |
| tree | 8132776c20aeaa8ec6703ea782afd44ffc76e3ce | |
| parent | c029b55af7d6b02b993e8a5add78d062da7a3940 [diff] | |
| parent | 3f43231230664c23f4a7513232171dcb6ce9f068 [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: [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