From: Christoffer Dall <christoffer.dall@linaro.org>
Date: Fri, 19 Sep 2014 01:15:32 +0000 (-0700)
Subject: Merge remote-tracking branch 'kvm/next' into queue
X-Git-Tag: fixes-for-v3.18-merge-window~23^2~3^2~17
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a875dafcf9b6b266c855e1f9b0aa060ef585d38a;p=pandora-kernel.git

Merge remote-tracking branch 'kvm/next' into queue

Conflicts:
	arch/arm64/include/asm/kvm_host.h
	virt/kvm/arm/vgic.c
---

a875dafcf9b6b266c855e1f9b0aa060ef585d38a
Reading git-diff-tree failed