]> git.baikalelectronics.ru Git - kernel.git/commit
projects / kernel.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 6c530bb 78d1cc1)
Merge branch 'for-3.5' of git://linux-nfs.org/~bfields/linux
authorLinus Torvalds <torvalds@linux-foundation.org>
Sat, 16 Jun 2012 00:27:31 +0000 (17:27 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Sat, 16 Jun 2012 00:27:31 +0000 (17:27 -0700)
commitbf603d04987fe155f179bdf36f43cf3e707d8b0c
treeda75e7e06297afefbd9b5e81ad9f3af743456aa0tree | snapshot
parent6c530bb8df6c37e1099ea28075c0251d3fc9d388commit | diff
parent78d1cc1e87dc2f32bf27fcfb16aa5fb2ac93ef94commit | diff
Merge branch 'for-3.5' of git://linux-nfs.org/~bfields/linux

Pull two nfsd bugfixes from J. Bruce Fields.

* 'for-3.5' of git://linux-nfs.org/~bfields/linux:
  nfsd4: BUG_ON(!is_spin_locked()) no good on UP kernels
  NFS: hard-code init_net for NFS callback transports
Linux Kernel Source Tree.