Merge branch 'for-linus' into next

[linux-2.6-microblaze.git] / MAINTAINERS

diff --git a/MAINTAINERS b/MAINTAINERS
index 6d60b8e..d7e3eab 100644 (file)
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -4653,6 +4653,12 @@ Q:       http://patchwork.linuxtv.org/project/linux-media/list/
 T:     git git://linuxtv.org/anttip/media_tree.git
 F:     drivers/media/common/cypress_firmware*
 
+CYPRESS CY8CTMA140 TOUCHSCREEN DRIVER
+M:     Linus Walleij <linus.walleij@linaro.org>
+L:     linux-input@vger.kernel.org
+S:     Maintained
+F:     drivers/input/touchscreen/cy8ctma140.c
+
 CYTTSP TOUCHSCREEN DRIVER
 M:     Ferruh Yigit <fery@cypress.com>
 L:     linux-input@vger.kernel.org
@@ -7829,7 +7835,7 @@ T:        git git://linuxtv.org/media_tree.git
 F:     drivers/media/platform/sti/hva
 
 HWPOISON MEMORY FAILURE HANDLING
-M:     Naoya Horiguchi <n-horiguchi@ah.jp.nec.com>
+M:     Naoya Horiguchi <naoya.horiguchi@nec.com>
 L:     linux-mm@kvack.org
 S:     Maintained
 F:     mm/hwpoison-inject.c
@@ -9185,6 +9191,11 @@ L:       kexec@lists.infradead.org
 S:     Maintained
 W:     http://lse.sourceforge.net/kdump/
 F:     Documentation/admin-guide/kdump/
+F:     fs/proc/vmcore.c
+F:     include/linux/crash_core.h
+F:     include/linux/crash_dump.h
+F:     include/uapi/linux/vmcore.h
+F:     kernel/crash_*.c
 
 KEENE FM RADIO TRANSMITTER DRIVER
 M:     Hans Verkuil <hverkuil@xs4all.nl>