From: Paolo Bonzini <pbonzini@redhat.com>
Date: Tue, 5 Aug 2014 07:47:45 +0000 (+0200)
Subject: Merge tag 'kvm-arm-for-3.17' of git://git.kernel.org/pub/scm/linux/kernel/git/kvmarm... 
X-Git-Tag: omap-for-v3.17/fixes-against-rc2~130^2~11
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5d5768660539b6d0da0d46113ffb0676540579a6;p=pandora-kernel.git

Merge tag 'kvm-arm-for-3.17' of git://git./linux/kernel/git/kvmarm/kvmarm into kvm

KVM/ARM New features for 3.17 include:
 - Fixes and code refactoring for stage2 kvm MMU unmap_range
 - Support unmapping IPAs on deleting memslots for arm and arm64
 - Support MMIO mappings in stage2 faults
 - KVM VGIC v2 emulation on GICv3 hardware
 - Big-Endian support for arm/arm64 (guest and host)
 - Debug Architecture support for arm64 (arm32 is on Christoffer's todo list)

Conflicts:
	virt/kvm/arm/vgic.c [last minute cherry-pick from 3.17 to 3.16]
---

5d5768660539b6d0da0d46113ffb0676540579a6
Reading git-diff-tree failed