projects / openwrt / staging / blogic.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: a7e546f d10f27a)
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)
commit8497ae61d0e7f30ae9f20c5fcea94c957b6c3b83
tree5056b18355891ebcc4d5cd6eee6e9e0915728749tree | snapshot
parenta7e546f175f07630453c44b5afe14dd667dcfec9commit | diff
parentd10f27a750312ed5638c876e4bd6aa83664cccd8commit | diff
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
John Crispins staging tree