From: Paolo Bonzini <pbonzini@redhat.com>
Date: Mon, 15 Dec 2014 12:06:40 +0000 (+0100)
Subject: Merge tag 'kvm-arm-for-3.19-take2' of git://git.kernel.org/pub/scm/linux/kernel/git... 
X-Git-Tag: firefly_0821_release~176^2~2635^2~2
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=333bce5aac9e8cb7f6b27e0122a224d17be4dd5d;p=firefly-linux-kernel-4.4.55.git

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]
---

333bce5aac9e8cb7f6b27e0122a224d17be4dd5d