diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2012-06-16 02:27:31 +0200 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-06-16 02:27:31 +0200 |
| commit | 93dd048dbde493fb1eb11cdc844be5fa9cd1c925 (patch) | |
| tree | da75e7e06297afefbd9b5e81ad9f3af743456aa0 /drivers/acpi/apei/Makefile | |
| parent | Merge tag 'stable/for-linus-3.5-rc2-tag' of git://git.kernel.org/pub/scm/linu... (diff) | |
| parent | nfsd4: BUG_ON(!is_spin_locked()) no good on UP kernels (diff) | |
| download | linux-93dd048dbde493fb1eb11cdc844be5fa9cd1c925.tar.xz linux-93dd048dbde493fb1eb11cdc844be5fa9cd1c925.zip | |
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
Diffstat (limited to 'drivers/acpi/apei/Makefile')
0 files changed, 0 insertions, 0 deletions