diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-07-10 07:28:30 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-07-10 07:28:30 -0700 |
| commit | 7fc7693627f363820c0e95d1e082f73c197f83c4 (patch) | |
| tree | f5668642a7a2fe0eb1e6ceb519f4a9832bf687c8 /MAINTAINERS | |
| parent | 8733449b7c6aca8dc5357720c00633b0dfa78207 (diff) | |
| parent | 90c5ffe592ff3b33afe2bdfe5e9ec630fc599e32 (diff) | |
| download | linux-3.10-7fc7693627f363820c0e95d1e082f73c197f83c4.tar.gz linux-3.10-7fc7693627f363820c0e95d1e082f73c197f83c4.tar.bz2 linux-3.10-7fc7693627f363820c0e95d1e082f73c197f83c4.zip | |
Merge branch 'fixes' of master.kernel.org:/home/rmk/linux-2.6-arm
* 'fixes' of master.kernel.org:/home/rmk/linux-2.6-arm:
ARM: 6994/1: smp_twd: Fix typo in 'twd_timer_rate' printing
ARM: 6987/1: l2x0: fix disabling function to avoid deadlock
ARM: 6966/1: ep93xx: fix inverted RTS/DTR signals on uart1
ARM: 6980/1: mmci: use StartBitErr to detect bad connections
ARM: 6979/1: mach-vt8500: add forgotten irq_data conversion
ARM: move memory layout sanity checking before meminfo initialization
ARM: 6990/1: MAINTAINERS: add entry for ARM PMU profiling and debugging
ARM: 6989/1: perf: do not start the PMU when no events are present
ARM: dmabounce: fix map_single() error return value
Diffstat (limited to 'MAINTAINERS')
| -rw-r--r-- | MAINTAINERS | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index 4af7ab03266..187282da921 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -594,6 +594,16 @@ S: Maintained F: arch/arm/lib/floppydma.S 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/oprofile/common.c +F: arch/arm/kernel/pmu.c +F: arch/arm/include/asm/pmu.h +F: arch/arm/kernel/hw_breakpoint.c +F: arch/arm/include/asm/hw_breakpoint.h + ARM PORT M: Russell King <linux@arm.linux.org.uk> L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers) |