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

[linux-block.git] / MAINTAINERS

diff --git a/MAINTAINERS b/MAINTAINERS
index 7b9c0197b2a77d4eb7be530f0a8d0833c0e7529b..516b69d189b9c6415ee063c7196a0fb8abeb5eeb 100644 (file)
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -5051,11 +5051,10 @@ S:      Maintained
 F:     drivers/input/touchscreen/cy8ctma140.c
 
 CYTTSP TOUCHSCREEN DRIVER
-M:     Ferruh Yigit <fery@cypress.com>
+M:     Linus Walleij <linus.walleij@linaro.org>
 L:     linux-input@vger.kernel.org
-S:     Supported
+S:     Maintained
 F:     drivers/input/touchscreen/cyttsp*
-F:     include/linux/input/cyttsp.h
 
 D-LINK DIR-685 TOUCHKEYS DRIVER
 M:     Linus Walleij <linus.walleij@linaro.org>