Merge remote-tracking branch 'kvm/next' into queue
authorChristoffer Dall <christoffer.dall@linaro.org>
Fri, 19 Sep 2014 01:15:32 +0000 (18:15 -0700)
committerChristoffer Dall <christoffer.dall@linaro.org>
Fri, 19 Sep 2014 01:15:32 +0000 (18:15 -0700)
commita875dafcf9b6b266c855e1f9b0aa060ef585d38a
tree1903cb0a39ac1cade1940ccb559591cddf3660a0
parent0ba09511ddc3ff0b462f37b4fe4b9c4dccc054ec
parentf51770ed465e6eb41da7fa16fd92eb67069600cf
Merge remote-tracking branch 'kvm/next' into queue

Conflicts:
arch/arm64/include/asm/kvm_host.h
virt/kvm/arm/vgic.c
arch/arm/include/asm/kvm_host.h
arch/arm/kvm/arm.c
arch/arm64/include/asm/kvm_host.h
include/linux/kvm_host.h
virt/kvm/arm/vgic.c
virt/kvm/kvm_main.c