Merge tag 'nfs-for-3.10-4' of git://git.linux-nfs.org/projects/trondmy/linux-nfs
authorLinus Torvalds <torvalds@linux-foundation.org>
Sat, 1 Jun 2013 10:48:59 +0000 (19:48 +0900)
committerLinus Torvalds <torvalds@linux-foundation.org>
Sat, 1 Jun 2013 10:48:59 +0000 (19:48 +0900)
commitf8cb27916ae256ef3b4e2ecca7262109dcfdd083
tree163bffef6ab19dca50a25b454841e006578e233c
parent1d822d6094bbc1363907d9221acf5e78fb5c3ed9
parenteb54d43707c69340581940e1fcaecb4d7d17b814
Merge tag 'nfs-for-3.10-4' of git://git.linux-nfs.org/projects/trondmy/linux-nfs

Pull two NFS client fixes from Trond Myklebust:
 - Fix a regression that broke NFS mounting using klibc and busybox
 - Stable fix to check access modes correctly on NFSv4 delegated open()

* tag 'nfs-for-3.10-4' of git://git.linux-nfs.org/projects/trondmy/linux-nfs:
  NFS: Fix security flavor negotiation with legacy binary mounts
  NFSv4: Fix a thinko in nfs4_try_open_cached