Merge branches 'from-henrik', 'hidraw', 'logitech', 'picolcd', 'ps3', 'uclogic',...

[karo-tx-linux.git] / MAINTAINERS

diff --git a/MAINTAINERS b/MAINTAINERS
index b17587d9412f04318dab5e7368f6e5306ca57b91..553a863c26323dc5b7feeb5382a229c34236c73e 100644 (file)
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -5321,6 +5321,12 @@ L:       linux-mtd@lists.infradead.org
 S:     Maintained
 F:     drivers/mtd/devices/phram.c
 
+PICOLCD HID DRIVER
+M:     Bruno Prémont <bonbons@linux-vserver.org>
+L:     linux-input@vger.kernel.org
+S:     Maintained
+F:     drivers/hid/hid-picolcd*
+
 PICOXCELL SUPPORT
 M:     Jamie Iles <jamie@jamieiles.com>
 L:     linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)