From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Fri, 13 Aug 2010 17:37:30 +0000 (-0700)
Subject: Merge git://git.kernel.org/pub/scm/linux/kernel/git/sfrench/cifs-2.6
X-Git-Tag: MMI-PSA29.97-13-9~22565
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=2897c684d1d5140e0e0302e73660c7cb97981b27;p=GitHub%2FMotorolaMobilityLLC%2Fkernel-slsi.git

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
---

2897c684d1d5140e0e0302e73660c7cb97981b27