From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sat, 1 Jun 2013 10:48:59 +0000 (+0900)
Subject: Merge tag 'nfs-for-3.10-4' of git://git.linux-nfs.org/projects/trondmy/linux-nfs
X-Git-Tag: v3.10-rc4~7
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=f8cb27916ae256ef3b4e2ecca7262109dcfdd083;p=profile%2Fcommon%2Fkernel-common.git

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

f8cb27916ae256ef3b4e2ecca7262109dcfdd083