projects / cascardo / linux.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: c029b55 3f43231)
Merge git://git.kernel.org/pub/scm/linux/kernel/git/sfrench/cifs-2.6
authorLinus Torvalds <torvalds@linux-foundation.org>
Fri, 13 Aug 2010 17:37:30 +0000 (10:37 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Fri, 13 Aug 2010 17:37:30 +0000 (10:37 -0700)
commit2897c684d1d5140e0e0302e73660c7cb97981b27
tree8132776c20aeaa8ec6703ea782afd44ffc76e3cetree | snapshot
parentc029b55af7d6b02b993e8a5add78d062da7a3940commit | diff
parent3f43231230664c23f4a7513232171dcb6ce9f068commit | diff
Merge git://git./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
fs/afs/internal.h diff1 | diff2 | blob | history
Unnamed repository; edit this file 'description' to name the repository.