| commit | 93dd048dbde493fb1eb11cdc844be5fa9cd1c925 | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@linux-foundation.org> | Fri Jun 15 17:27:31 2012 -0700 |
| committer | Linus Torvalds <torvalds@linux-foundation.org> | Fri Jun 15 17:27:31 2012 -0700 |
| tree | da75e7e06297afefbd9b5e81ad9f3af743456aa0 | |
| parent | 069915b94642b05c9b45fee36862157026b36614 [diff] | |
| parent | bc2df47a408f2d64cf81bcfd0f6e3e14c84cb0ab [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