projects / openwrt / staging / blogic.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: f927318 bcd1c29)
Merge git://git.kernel.org/pub/scm/virt/kvm/kvm
authorLinus Torvalds <torvalds@linux-foundation.org>
Tue, 1 Oct 2013 17:25:10 +0000 (10:25 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Tue, 1 Oct 2013 17:25:10 +0000 (10:25 -0700)
Pull two KVM fixes from Gleb Natapov.

* git://git.kernel.org/pub/scm/virt/kvm/kvm:
  KVM: VMX: do not check bit 12 of EPT violation exit qualification when undefined
  ARM: kvm: rename cpu_reset to avoid name clash


Trivial merge
John Crispins staging tree