diff options
| author | Linus Torvalds <[email protected]> | 2012-05-31 19:09:07 +0000 |
|---|---|---|
| committer | Linus Torvalds <[email protected]> | 2012-05-31 19:09:07 +0000 |
| commit | bd0e162d0312aa95e8b85ba883efddebf27be121 (patch) | |
| tree | 5401fd64650a2c5965e43dccaa636bc814072043 /fs/proc/array.c | |
| parent | Merge tag 'scsi-misc' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi (diff) | |
| parent | KVM: Export asm-generic/kvm_para.h (diff) | |
| download | kernel-bd0e162d0312aa95e8b85ba883efddebf27be121.tar.gz kernel-bd0e162d0312aa95e8b85ba883efddebf27be121.zip | |
Merge git://git.kernel.org/pub/scm/virt/kvm/kvm
Pull two small kvm fixes from Avi Kivity:
"A build fix for non-kvm archs and a transparent hugepage refcount
bugfix on hosts with 4M pages."
* git://git.kernel.org/pub/scm/virt/kvm/kvm:
KVM: Export asm-generic/kvm_para.h
KVM: MMU: fix huge page adapted on non-PAE host
Diffstat (limited to 'fs/proc/array.c')
0 files changed, 0 insertions, 0 deletions