Merge tag 'kvm-arm-for-3.19-take2' of git://git.kernel.org/pub/scm/linux/kernel/git...
authorPaolo Bonzini <pbonzini@redhat.com>
Mon, 15 Dec 2014 12:06:40 +0000 (13:06 +0100)
committerPaolo Bonzini <pbonzini@redhat.com>
Mon, 15 Dec 2014 12:06:40 +0000 (13:06 +0100)
commit333bce5aac9e8cb7f6b27e0122a224d17be4dd5d
tree7a171a51d9a999f90dd6f17f2b7dd0997dbc1a38
parentab646f54f4fd1a8b9671b8707f0739fdd28ce2b1
parent05971120fca43e0357789a14b3386bb56eef2201
Merge tag 'kvm-arm-for-3.19-take2' of git://git./linux/kernel/git/kvmarm/kvmarm into HEAD

Second round of changes for KVM for arm/arm64 for v3.19; fixes reboot
problems, clarifies VCPU init, and fixes a regression concerning the
VGIC init flow.

Conflicts:
arch/ia64/kvm/kvm-ia64.c [deleted in HEAD and modified in kvmarm]
Documentation/virtual/kvm/api.txt
arch/x86/kvm/mmu.c
include/linux/kvm_host.h
virt/kvm/kvm_main.c