Merge commit 'v3.3-rc6' into next

[linux-flexiantxendom0-3.2.10.git] / MAINTAINERS

diff --git a/MAINTAINERS b/MAINTAINERS
index 4e41d52..b31d1c9 100644 (file)
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -2089,6 +2089,13 @@ W:       http://www.cyclades.com/
 S:     Orphan
 F:     drivers/net/wan/pc300*
 
+CYTTSP TOUCHSCREEN DRIVER
+M:      Javier Martinez Canillas <javier@dowhile0.org>
+L:      linux-input@vger.kernel.org
+S:      Maintained
+F:      drivers/input/touchscreen/cyttsp*
+F:      include/linux/input/cyttsp.h
+
 DAMA SLAVE for AX.25
 M:     Joerg Reuter <jreuter@yaina.de>
 W:     http://yaina.de/jreuter/