diff options
author | Russell King <rmk+kernel@arm.linux.org.uk> | 2015-08-07 19:58:48 +0100 |
---|---|---|
committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2015-08-10 15:57:44 +0100 |
commit | 81497953e37bc28209d9a647171ea93b4a99fc57 (patch) | |
tree | 78ed19754c29edd182e3d1e0850eb79cce490f63 /MAINTAINERS | |
parent | fa8ad7889d83bcf0a6cdbf6d3622f3ec019cde14 (diff) | |
parent | be120397e7709d9d5ed88317a385ce864a2603bc (diff) | |
download | linux-stable-81497953e37bc28209d9a647171ea93b4a99fc57.tar.gz linux-stable-81497953e37bc28209d9a647171ea93b4a99fc57.tar.bz2 linux-stable-81497953e37bc28209d9a647171ea93b4a99fc57.zip |
Merge branch 'psci/for-rmk' of git://git.kernel.org/pub/scm/linux/kernel/git/arm64/linux into devel-stable
Diffstat (limited to 'MAINTAINERS')
-rw-r--r-- | MAINTAINERS | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index 485c92ced47d..44998e18fd22 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -8066,6 +8066,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 |