]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge remote-tracking branch 'kvm/linux-next'
authorThierry Reding <treding@nvidia.com>
Thu, 24 Oct 2013 12:58:35 +0000 (14:58 +0200)
committerThierry Reding <treding@nvidia.com>
Thu, 24 Oct 2013 12:58:35 +0000 (14:58 +0200)
commit01ad95d812b5be09bec8176090eda744df4edd47
tree3683978f996fe12d1e7755b500c5adb577199414
parent911e332f0a01eabdf13f027909534ae060f34cc5
parentd570142674890fe10b3d7d86aa105e3dfce1ddfa
Merge remote-tracking branch 'kvm/linux-next'

Conflicts:
arch/arm/kvm/reset.c
arch/arm/kvm/reset.c
arch/s390/kvm/interrupt.c
arch/s390/kvm/kvm-s390.c
arch/x86/include/uapi/asm/msr-index.h
arch/x86/kvm/vmx.c
virt/kvm/kvm_main.c