projects / openwrt / staging / blogic.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 0545522 56457f3)
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)
commitbd0e162d0312aa95e8b85ba883efddebf27be121
tree5401fd64650a2c5965e43dccaa636bc814072043tree | snapshot
parent054552272e6e152ff40f8b7f164dd390a5a62097commit | diff
parent56457f38f212344fb38b250cfa7e7311c065022fcommit | 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
John Crispins staging tree