OSDN Git Service
(root)
/
uclinux-h8
/
linux.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
069915b
bc2df47
)
Merge branch 'for-3.5' of git://linux-nfs.org/~bfields/linux
author
Linus Torvalds
<torvalds@linux-foundation.org>
Sat, 16 Jun 2012 00:27:31 +0000
(17:27 -0700)
committer
Linus Torvalds
<torvalds@linux-foundation.org>
Sat, 16 Jun 2012 00:27:31 +0000
(17:27 -0700)
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
Trivial merge
OSDN Git Service
