diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2013-10-01 19:25:10 +0200 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2013-10-01 19:25:10 +0200 |
commit | 77c4ad8e231ae8b31cbde28f1e4a2c00df3bc238 (patch) | |
tree | 621745cec6170809cc94fe639665e6050b3050ac /fs | |
parent | Merge tag 'nfs-for-3.12-4' of git://git.linux-nfs.org/projects/trondmy/linux-nfs (diff) | |
parent | KVM: VMX: do not check bit 12 of EPT violation exit qualification when undefined (diff) | |
download | linux-77c4ad8e231ae8b31cbde28f1e4a2c00df3bc238.tar.xz linux-77c4ad8e231ae8b31cbde28f1e4a2c00df3bc238.zip |
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 'fs')
0 files changed, 0 insertions, 0 deletions