]> git.baikalelectronics.ru Git - kernel.git/commit
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)
commit3a75dd99886d6f8d05da25f1b843e2000b4e665f
tree1903cb0a39ac1cade1940ccb559591cddf3660a0
parent7e271e6146b4003f25de5fefd4c63713c2458ad0
parentfdd52d34c996fa92a2d0e9ff1568bf05849cd940
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