From: Will Deacon <will.deacon@arm.com>
Date: Wed, 5 Aug 2015 13:14:06 +0000 (+0100)
Subject: Merge branch 'aarch64/psci/drivers' into aarch64/for-next/core
X-Git-Tag: omap-for-v4.3/fixes-rc1~98^2~9
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d422e62562e0dcef0ace4cd4fc4b4519d0a55ab4;p=pandora-kernel.git

Merge branch 'aarch64/psci/drivers' into aarch64/for-next/core

Move our PSCI implementation out into drivers/firmware/ where it can be
shared with arch/arm/.

Conflicts:
	arch/arm64/kernel/psci.c
---

d422e62562e0dcef0ace4cd4fc4b4519d0a55ab4
Reading git-diff-tree failed