| commit | bd0e162d0312aa95e8b85ba883efddebf27be121 | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@linux-foundation.org> | Thu May 31 12:09:07 2012 -0700 |
| committer | Linus Torvalds <torvalds@linux-foundation.org> | Thu May 31 12:09:07 2012 -0700 |
| tree | 5401fd64650a2c5965e43dccaa636bc814072043 | |
| parent | 054552272e6e152ff40f8b7f164dd390a5a62097 [diff] | |
| parent | 56457f38f212344fb38b250cfa7e7311c065022f [diff] |
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