diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2015-09-03 15:28:50 +0100 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2015-09-03 15:28:50 +0100 |
| commit | 3ff32a0def6e0d2e21a6c5ad1b00726592774018 (patch) | |
| tree | af683b2cb62f7e5ee18cb109d15dcfd43769b984 /MAINTAINERS | |
| parent | 40d3f02851577da27b5cbb1538888301245ef1e7 (diff) | |
| parent | 81497953e37bc28209d9a647171ea93b4a99fc57 (diff) | |
| download | op-kernel-dev-3ff32a0def6e0d2e21a6c5ad1b00726592774018.zip op-kernel-dev-3ff32a0def6e0d2e21a6c5ad1b00726592774018.tar.gz | |
Merge branch 'devel-stable' into for-linus
Conflicts:
drivers/perf/arm_pmu.c
Diffstat (limited to 'MAINTAINERS')
| -rw-r--r-- | MAINTAINERS | 15 |
1 files changed, 13 insertions, 2 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index fd60784..44998e1 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> @@ -8064,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 |
