projects / kernel.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 9ccc320 c6b82b0)
Merge git://git.kernel.org/pub/scm/virt/kvm/kvm
authorLinus Torvalds <torvalds@linux-foundation.org>
Thu, 31 May 2012 19:09:07 +0000 (12:09 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Thu, 31 May 2012 19:09:07 +0000 (12:09 -0700)
commit7eb4f126c57245059f4b2fbd9bf8476e5f1154d4
tree5401fd64650a2c5965e43dccaa636bc814072043tree | snapshot
parent9ccc320599981710331d8a55ae35b0c6e9e72bc3commit | diff
parentc6b82b0e7ea4b5e072b380eaea439ddc197ee47ccommit | 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
Linux Kernel Source Tree.