]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge remote-tracking branch 'kvm/linux-next'
authorMark Brown <broonie@linaro.org>
Thu, 17 Oct 2013 22:23:34 +0000 (23:23 +0100)
committerMark Brown <broonie@linaro.org>
Thu, 17 Oct 2013 22:23:34 +0000 (23:23 +0100)
commit2d8b2b8a27f59ec8738556c17be75e2eae937a4c
treeada5e7ab72047e1d7e288f78cce2ae82545f267c
parent034b0356f51554c0ca0149856df8bca4955a3dd6
parentd570142674890fe10b3d7d86aa105e3dfce1ddfa
Merge remote-tracking branch 'kvm/linux-next'

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