From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sat, 16 Jun 2012 00:27:31 +0000 (-0700)
Subject: Merge branch 'for-3.5' of git://linux-nfs.org/~bfields/linux
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=93dd048dbde493fb1eb11cdc844be5fa9cd1c925;p=linux-beck.git

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
---

93dd048dbde493fb1eb11cdc844be5fa9cd1c925