projects / firefly-linux-kernel-4.4.55.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 8ec4198 514f161)
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)
commitd422e62562e0dcef0ace4cd4fc4b4519d0a55ab4
treea4769135920d8ec4ded9569f89c231130980ba42tree | snapshot
parent8ec41987436d566f7c4559c6871738b869f7ef07commit | diff
parent514f161abcda065914f7ea8954c815eee98074a5commit | diff
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
MAINTAINERS diff1 | diff2 | blob | history
arch/arm64/Kconfig diff1 | diff2 | blob | history
arch/arm64/kernel/psci.c diff1 | diff2 | blob | history
arch/arm64/kernel/setup.c diff1 | diff2 | blob | history
Unnamed repository; edit this file 'description' to name the repository.