projects
/
kernel
/
kernel-generic.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
0545522
56457f3
)
Merge git://git.kernel.org/pub/scm/virt/kvm/kvm
author
Linus Torvalds
<torvalds@linux-foundation.org>
Thu, 31 May 2012 19:09:07 +0000
(12:09 -0700)
committer
Linus Torvalds
<torvalds@linux-foundation.org>
Thu, 31 May 2012 19:09:07 +0000
(12:09 -0700)
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
Trivial merge