diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2013-10-01 10:25:10 -0700 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2013-10-01 10:25:10 -0700 |
commit | 77c4ad8e231ae8b31cbde28f1e4a2c00df3bc238 (patch) | |
tree | 621745cec6170809cc94fe639665e6050b3050ac /arch/arm/mach-omap1/time.c | |
parent | f927318840745095cc7003f1564ca4b87655745d (diff) | |
parent | bcd1c2949501869631b25fd62d8df5079677a101 (diff) | |
download | linux-77c4ad8e231ae8b31cbde28f1e4a2c00df3bc238.tar.bz2 |
Merge git://git.kernel.org/pub/scm/virt/kvm/kvm
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
Diffstat (limited to 'arch/arm/mach-omap1/time.c')
0 files changed, 0 insertions, 0 deletions