diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2015-08-31 08:32:27 +1000 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2015-08-31 08:32:27 +1000 |
| commit | 86e74f637c096a30bc20208dc94ba68c27ed7305 (patch) | |
| tree | 7cc73e78f42a999d68b72e59626d7f2f09908ad0 /MAINTAINERS | |
| parent | 565ac15a3374f2f9a125fb8508892761a4aa3851 (diff) | |
| parent | 0986c811d54fa0aad749974a434d5c55e95c6534 (diff) | |
Merge remote-tracking branch 'arm/for-next'
Diffstat (limited to 'MAINTAINERS')
| -rw-r--r-- | MAINTAINERS | 15 |
1 files changed, 13 insertions, 2 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index a8aff6834bca..a366ac574f19 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -799,11 +799,13 @@ F: arch/arm/include/asm/floppy.h ARM PMU PROFILING AND DEBUGGING M: Will Deacon <will.deacon@arm.com> S: Maintained -F: arch/arm/kernel/perf_event* +F: arch/arm/kernel/perf_* F: arch/arm/oprofile/common.c -F: arch/arm/include/asm/pmu.h F: arch/arm/kernel/hw_breakpoint.c F: arch/arm/include/asm/hw_breakpoint.h +F: arch/arm/include/asm/perf_event.h +F: drivers/perf/arm_pmu.c +F: include/linux/perf/arm_pmu.h ARM PORT M: Russell King <linux@arm.linux.org.uk> @@ -8085,6 +8087,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 |