From: Paolo Bonzini <pbonzini@redhat.com>
Date: Fri, 23 Jan 2015 12:39:51 +0000 (+0100)
Subject: Merge tag 'kvm-arm-for-3.20' of git://git.kernel.org/pub/scm/linux/kernel/git/kvmarm... 
X-Git-Tag: omap-for-v4.1/prcm-dts-mfd-syscon-fix~97^2~37
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=1c6007d59a20762052cc92c0a2889ff11030d23a;p=pandora-kernel.git

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

KVM/ARM changes for v3.20 including GICv3 emulation, dirty page logging, added
trace symbols, and adding an explicit VGIC init device control IOCTL.

Conflicts:
	arch/arm64/include/asm/kvm_arm.h
	arch/arm64/kvm/handle_exit.c
---

1c6007d59a20762052cc92c0a2889ff11030d23a
Reading git-diff-tree failed