]> git.proxmox.com Git - mirror_ubuntu-eoan-kernel.git/commit
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)
commit93dd048dbde493fb1eb11cdc844be5fa9cd1c925
treeda75e7e06297afefbd9b5e81ad9f3af743456aa0
parent069915b94642b05c9b45fee36862157026b36614
parentbc2df47a408f2d64cf81bcfd0f6e3e14c84cb0ab
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