x86/xen: use capabilities instead of fake cpuid values for aperf

[karo-tx-linux.git] / MAINTAINERS

diff --git a/MAINTAINERS b/MAINTAINERS
index 0f6df84fec54fd3835d75c1c4198628e07c4397a..33ecf266570f9f28002da5ba403f6944ad8da4ae 100644 (file)
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -2327,21 +2327,6 @@ S:       Maintained
 F:     drivers/auxdisplay/
 F:     include/linux/cfag12864b.h
 
-AVR32 ARCHITECTURE
-M:     Haavard Skinnemoen <hskinnemoen@gmail.com>
-M:     Hans-Christian Egtvedt <egtvedt@samfundet.no>
-W:     http://www.atmel.com/products/AVR32/
-W:     http://mirror.egtvedt.no/avr32linux.org/
-W:     http://avrfreaks.net/
-S:     Maintained
-F:     arch/avr32/
-
-AVR32/AT32AP MACHINE SUPPORT
-M:     Haavard Skinnemoen <hskinnemoen@gmail.com>
-M:     Hans-Christian Egtvedt <egtvedt@samfundet.no>
-S:     Maintained
-F:     arch/avr32/mach-at32ap/
-
 AX.25 NETWORK LAYER
 M:     Ralf Baechle <ralf@linux-mips.org>
 L:     linux-hams@vger.kernel.org
@@ -5430,6 +5415,23 @@ F:       fs/fuse/
 F:     include/uapi/linux/fuse.h
 F:     Documentation/filesystems/fuse.txt
 
+FUTEX SUBSYSTEM
+M:     Thomas Gleixner <tglx@linutronix.de>
+M:     Ingo Molnar <mingo@redhat.com>
+R:     Peter Zijlstra <peterz@infradead.org>
+R:     Darren Hart <dvhart@infradead.org>
+L:     linux-kernel@vger.kernel.org
+T:     git git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git locking/core
+S:     Maintained
+F:     kernel/futex.c
+F:     kernel/futex_compat.c
+F:     include/asm-generic/futex.h
+F:     include/linux/futex.h
+F:     include/uapi/linux/futex.h
+F:     tools/testing/selftests/futex/
+F:     tools/perf/bench/futex*
+F:     Documentation/*futex*
+
 FUTURE DOMAIN TMC-16x0 SCSI DRIVER (16-bit)
 M:     Rik Faith <faith@cs.unc.edu>
 L:     linux-scsi@vger.kernel.org
@@ -11134,6 +11136,7 @@ F:      drivers/power/supply/bq27xxx_battery_i2c.c
 TIMEKEEPING, CLOCKSOURCE CORE, NTP, ALARMTIMER
 M:     John Stultz <john.stultz@linaro.org>
 M:     Thomas Gleixner <tglx@linutronix.de>
+R:     Stephen Boyd <sboyd@codeaurora.org>
 L:     linux-kernel@vger.kernel.org
 T:     git git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git timers/core
 S:     Supported