diff options
author | Will Deacon <will.deacon@arm.com> | 2015-08-05 14:14:06 +0100 |
---|---|---|
committer | Will Deacon <will.deacon@arm.com> | 2015-08-05 14:14:06 +0100 |
commit | d422e62562e0dcef0ace4cd4fc4b4519d0a55ab4 (patch) | |
tree | a4769135920d8ec4ded9569f89c231130980ba42 /MAINTAINERS | |
parent | 8ec41987436d566f7c4559c6871738b869f7ef07 (diff) | |
parent | 514f161abcda065914f7ea8954c815eee98074a5 (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
Diffstat (limited to 'MAINTAINERS')
-rw-r--r-- | MAINTAINERS | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index 9289ecb57b68..c872ff9d1eeb 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -8071,6 +8071,15 @@ S: Maintained F: include/linux/power_supply.h F: drivers/power/ +POWER STATE COORDINATION INTERFACE (PSCI) +M: Mark Rutland <mark.rutland@arm.com> +M: Lorenzo Pieralisi <lorenzo.pieralisi@arm.com> +L: linux-arm-kernel@lists.infradead.org +S: Maintained +F: drivers/firmware/psci.c +F: include/linux/psci.h +F: include/uapi/linux/psci.h + PNP SUPPORT M: "Rafael J. Wysocki" <rafael.j.wysocki@intel.com> S: Maintained |