diff --git a/[refs] b/[refs] index a1c14c90f9d2..06e7ee1379a8 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: a93ab8494873a88622bf74be861a93f875643524 +refs/heads/master: efdbb10eaaede124fb32751e9aaf19d506301bd2 diff --git a/trunk/MAINTAINERS b/trunk/MAINTAINERS index 04ea1f23756f..60012bc02029 100644 --- a/trunk/MAINTAINERS +++ b/trunk/MAINTAINERS @@ -5291,6 +5291,12 @@ L: linux-mtd@lists.infradead.org S: Maintained F: drivers/mtd/devices/phram.c +PICOLCD HID DRIVER +M: Bruno Prémont +L: linux-input@vger.kernel.org +S: Maintained +F: drivers/hid/hid-picolcd* + PICOXCELL SUPPORT M: Jamie Iles L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)