Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input

[linux-2.6-block.git] / MAINTAINERS

diff --git a/MAINTAINERS b/MAINTAINERS
index 9d8ab7c681f9e3dd8e5c270cac5f713eb0395c89..e775ecaf5d1f49a1c97ebe333869cff9463c07a5 100644 (file)
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -2494,9 +2494,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
 
@@ -4141,6 +4141,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
@@ -6315,6 +6322,13 @@ F:       Documentation/PCI/
 F:     drivers/pci/
 F:     include/linux/pci*
 
+PCI DRIVER FOR NVIDIA TEGRA
+M:     Thierry Reding <thierry.reding@gmail.com>
+L:     linux-tegra@vger.kernel.org
+S:     Supported
+F:     Documentation/devicetree/bindings/pci/nvidia,tegra20-pcie.txt
+F:     drivers/pci/host/pci-tegra.c
+
 PCMCIA SUBSYSTEM
 P:     Linux PCMCIA Team
 L:     linux-pcmcia@lists.infradead.org
@@ -6961,6 +6975,14 @@ M:       Maxim Levitsky <maximlevitsky@gmail.com>
 S:     Maintained
 F:     drivers/memstick/host/r592.*
 
+ROCCAT DRIVERS
+M:     Stefan Achatz <erazor_de@users.sourceforge.net>
+W:     http://sourceforge.net/projects/roccat/
+S:     Maintained
+F:     drivers/hid/hid-roccat*
+F:     include/linux/hid-roccat*
+F:     Documentation/ABI/*/sysfs-driver-hid-roccat*
+
 ROCKETPORT DRIVER
 P:     Comtrol Corp.
 W:     http://www.comtrol.com
@@ -8365,9 +8387,14 @@ M:       Chris Metcalf <cmetcalf@tilera.com>
 W:     http://www.tilera.com/scm/
 S:     Supported
 F:     arch/tile/
-F:     drivers/tty/hvc/hvc_tile.c
-F:     drivers/net/ethernet/tile/
+F:     drivers/char/tile-srom.c
 F:     drivers/edac/tile_edac.c
+F:     drivers/net/ethernet/tile/
+F:     drivers/rtc/rtc-tile.c
+F:     drivers/tty/hvc/hvc_tile.c
+F:     drivers/tty/serial/tilegx.c
+F:     drivers/usb/host/*-tilegx.c
+F:     include/linux/usb/tilegx.h
 
 TLAN NETWORK DRIVER
 M:     Samuel Chessman <chessman@tux.org>