From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sat, 25 Aug 2012 18:43:41 +0000 (-0700)
Subject: Merge branch 'for-3.6' of git://linux-nfs.org/~bfields/linux
X-Git-Tag: v3.6-rc4~17
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=8497ae61d0e7f30ae9f20c5fcea94c957b6c3b83;p=users%2Fdwmw2%2Flinux.git

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

Pull nfsd bugfixes from J. Bruce Fields:
 "Particular thanks to Michael Tokarev, Malahal Naineni, and Jamie
  Heilman for their testing and debugging help."

* 'for-3.6' of git://linux-nfs.org/~bfields/linux:
  svcrpc: fix svc_xprt_enqueue/svc_recv busy-looping
  svcrpc: sends on closed socket should stop immediately
  svcrpc: fix BUG() in svc_tcp_clear_pages
  nfsd4: fix security flavor of NFSv4.0 callback
---

8497ae61d0e7f30ae9f20c5fcea94c957b6c3b83