diff --git a/[refs] b/[refs] index dd85eaa52ebe..729b90255e03 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: aaa60fa7ac66ede814f7ad37a2b3a07b4f784756 +refs/heads/master: e3ae3525250b01560b31fb627e17ae9c6c359232 diff --git a/trunk/MAINTAINERS b/trunk/MAINTAINERS index 3523ab000f1f..5fa873238274 100644 --- a/trunk/MAINTAINERS +++ b/trunk/MAINTAINERS @@ -2110,6 +2110,13 @@ W: http://www.cyclades.com/ S: Orphan F: drivers/net/wan/pc300* +CYTTSP TOUCHSCREEN DRIVER +M: Javier Martinez Canillas +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 W: http://yaina.de/jreuter/