From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Thu, 31 May 2012 19:09:07 +0000 (-0700)
Subject: Merge git://git.kernel.org/pub/scm/virt/kvm/kvm
X-Git-Tag: v3.5-rc1~24
X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=commitdiff_plain;h=bd0e162d0312aa95e8b85ba883efddebf27be121;p=linux.git

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
---

bd0e162d0312aa95e8b85ba883efddebf27be121