From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Wed, 17 Jul 2013 20:43:55 +0000 (-0700)
Subject: Merge branch 'for-3.11' of git://linux-nfs.org/~bfields/linux
X-Git-Tag: v4.0~3644
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=61f98b0fca802d7e0191072606519e2230a6226d;p=platform%2Fkernel%2Flinux-amlogic.git

Merge branch 'for-3.11' of git://linux-nfs.org/~bfields/linux

Pull nfsd bugfixes from Bruce Fields:
 "Just three minor bugfixes"

* 'for-3.11' of git://linux-nfs.org/~bfields/linux:
  svcrdma: underflow issue in decode_write_list()
  nfsd4: fix minorversion support interface
  lockd: protect nlm_blocked access in nlmsvc_retry_blocked
---

61f98b0fca802d7e0191072606519e2230a6226d