Merge branch 'for-3.11' of git://linux-nfs.org/~bfields/linux
authorLinus Torvalds <torvalds@linux-foundation.org>
Wed, 17 Jul 2013 20:43:55 +0000 (13:43 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Wed, 17 Jul 2013 20:43:55 +0000 (13:43 -0700)
commit61f98b0fca802d7e0191072606519e2230a6226d
tree2f6d5f85ea21042c0299e6204c9a99f3a7172279
parentc0d15cc7ee8c0d1970197d9eb1727503bcdd2471
parentb2781e1021525649c0b33fffd005ef219da33926
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
fs/lockd/svclock.c