diff options
| author | Linus Torvalds <[email protected]> | 2010-08-13 17:37:30 +0000 |
|---|---|---|
| committer | Linus Torvalds <[email protected]> | 2010-08-13 17:37:30 +0000 |
| commit | 2897c684d1d5140e0e0302e73660c7cb97981b27 (patch) | |
| tree | 8132776c20aeaa8ec6703ea782afd44ffc76e3ce /fs/jbd/commit.c | |
| parent | Merge branch 'x86/urgent' of git://git.kernel.org/pub/scm/linux/kernel/git/ti... (diff) | |
| parent | [NFS] Set CONFIG_KEYS when CONFIG_NFS_USE_KERNEL_DNS is set (diff) | |
| download | kernel-2897c684d1d5140e0e0302e73660c7cb97981b27.tar.gz kernel-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 'fs/jbd/commit.c')
0 files changed, 0 insertions, 0 deletions