Merge git://git.kernel.org/pub/scm/linux/kernel/git/cmetcalf/linux-tile

[karo-tx-linux.git] / MAINTAINERS

diff --git a/MAINTAINERS b/MAINTAINERS
index 73db93cc55fd9fde427de5df080e6495fba7df54..b4c6754f3144dbe2d5ae3ead8afbec2727e73fc3 100644 (file)
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -806,11 +806,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>
@@ -4416,6 +4418,7 @@ F:        include/linux/fscache*.h
 F2FS FILE SYSTEM
 M:     Jaegeuk Kim <jaegeuk@kernel.org>
 M:     Changman Lee <cm224.lee@samsung.com>
+R:     Chao Yu <chao2.yu@samsung.com>
 L:     linux-f2fs-devel@lists.sourceforge.net
 W:     http://en.wikipedia.org/wiki/F2FS
 T:     git git://git.kernel.org/pub/scm/linux/kernel/git/jaegeuk/f2fs.git
@@ -4424,6 +4427,7 @@ F:        Documentation/filesystems/f2fs.txt
 F:     Documentation/ABI/testing/sysfs-fs-f2fs
 F:     fs/f2fs/
 F:     include/linux/f2fs_fs.h
+F:     include/trace/events/f2fs.h
 
 FUJITSU FR-V (FRV) PORT
 M:     David Howells <dhowells@redhat.com>
@@ -8118,6 +8122,15 @@ F:       include/linux/power_supply.h
 F:     drivers/power/
 X:     drivers/power/avs/
 
+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