]> git.baikalelectronics.ru Git - kernel.git/commit
projects / kernel.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 35d7e1b 2c279b9)
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)
commit89c285f232b1d7252d643001347fa0cc79e03cbd
treeda75e7e06297afefbd9b5e81ad9f3af743456aa0tree | snapshot
parent35d7e1b08b812dfeaad2c190c2368368c2e6b935commit | diff
parent2c279b9406c483bad7b159824a1b1c05f96bc988commit | 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.