summaryrefslogtreecommitdiffstats
path: root/MAINTAINERS
diff options
context:
space:
mode:
authorDmitry Torokhov <dmitry.torokhov@gmail.com>2013-09-06 20:23:44 -0700
committerDmitry Torokhov <dmitry.torokhov@gmail.com>2013-09-06 20:23:44 -0700
commit07176b988ebb20f46a317a60ee1d983fe1630203 (patch)
treee54affb1f823742078c68d9506e6035016bc2ea4 /MAINTAINERS
parentfa46c7984092f3dbdbb3bcd7338d81a1168d9d2b (diff)
parent52764fed5049655926bcecaefd52f0a415ceb105 (diff)
downloadlinux-07176b988ebb20f46a317a60ee1d983fe1630203.tar.bz2
Merge branch 'next' into for-linus
Merge first round of changes for 3.12 merge window.
Diffstat (limited to 'MAINTAINERS')
-rw-r--r--MAINTAINERS11
1 files changed, 9 insertions, 2 deletions
diff --git a/MAINTAINERS b/MAINTAINERS
index 250dc970c62d..15c2d216b402 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -2411,9 +2411,9 @@ S: Maintained
F: drivers/media/common/cypress_firmware*
CYTTSP TOUCHSCREEN DRIVER
-M: Javier Martinez Canillas <javier@dowhile0.org>
+M: Ferruh Yigit <fery@cypress.com>
L: linux-input@vger.kernel.org
-S: Maintained
+S: Supported
F: drivers/input/touchscreen/cyttsp*
F: include/linux/input/cyttsp.h
@@ -4038,6 +4038,13 @@ W: http://launchpad.net/ideapad-laptop
S: Maintained
F: drivers/platform/x86/ideapad-laptop.c
+IDEAPAD LAPTOP SLIDEBAR DRIVER
+M: Andrey Moiseev <o2g.org.ru@gmail.com>
+L: linux-input@vger.kernel.org
+W: https://github.com/o2genum/ideapad-slidebar
+S: Maintained
+F: drivers/input/misc/ideapad_slidebar.c
+
IDE/ATAPI DRIVERS
M: Borislav Petkov <bp@alien8.de>
L: linux-ide@vger.kernel.org