]> git.baikalelectronics.ru Git - kernel.git/commit
Merge branch 'for-3.6' of git://linux-nfs.org/~bfields/linux
authorLinus Torvalds <torvalds@linux-foundation.org>
Sat, 25 Aug 2012 18:43:41 +0000 (11:43 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Sat, 25 Aug 2012 18:43:41 +0000 (11:43 -0700)
commitbbb6c8c43ad460071bc536b84a58821ea050116b
tree5056b18355891ebcc4d5cd6eee6e9e0915728749
parent6bc72b66c811f3ff80073b808d18ae3d5e6a310e
parent4cb36983075b199c9444341ea15ceb244c9076b2
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