Merge branch 'aarch64/psci/drivers' into aarch64/for-next/core
authorWill Deacon <will.deacon@arm.com>
Wed, 5 Aug 2015 13:14:06 +0000 (14:14 +0100)
committerWill Deacon <will.deacon@arm.com>
Wed, 5 Aug 2015 13:14:06 +0000 (14:14 +0100)
Move our PSCI implementation out into drivers/firmware/ where it can be
shared with arch/arm/.

Conflicts:
arch/arm64/kernel/psci.c


Trivial merge