summaryrefslogtreecommitdiffstats
path: root/MAINTAINERS
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2016-06-27 20:34:43 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2016-06-27 20:34:43 -0700
commit18751e2eb51261059e51e1a7cf5aec2fd5429608 (patch)
tree6b41c4d5826e004932935cbe1917251fc1b130de /MAINTAINERS
parent3992a272a72c7a258236cf035f74396ec4f89941 (diff)
parent60842ef8128e7bf58c024814cd0dc14319232b6c (diff)
downloadlinux-stable-18751e2eb51261059e51e1a7cf5aec2fd5429608.tar.gz
linux-stable-18751e2eb51261059e51e1a7cf5aec2fd5429608.tar.bz2
linux-stable-18751e2eb51261059e51e1a7cf5aec2fd5429608.zip
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input
Pull input fixes from Dmitry Torokhov. * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input: Input: vmmouse - remove port reservation Input: elantech - add more IC body types to the list Input: wacom_w8001 - ignore invalid pen data packets Input: wacom_w8001 - w8001_MAX_LENGTH should be 13 Input: xpad - fix oops when attaching an unknown Xbox One gamepad MAINTAINERS: add Pali Rohár as reviewer of ALPS PS/2 touchpad driver Input: add HDMI CEC specific keycodes Input: add BUS_CEC type Input: xpad - fix rumble on Xbox One controllers with 2015 firmware
Diffstat (limited to 'MAINTAINERS')
-rw-r--r--MAINTAINERS4
1 files changed, 4 insertions, 0 deletions
diff --git a/MAINTAINERS b/MAINTAINERS
index 952fd2aba7b7..0f148d3bdae7 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -595,6 +595,10 @@ S: Odd Fixes
L: linux-alpha@vger.kernel.org
F: arch/alpha/
+ALPS PS/2 TOUCHPAD DRIVER
+R: Pali Rohár <pali.rohar@gmail.com>
+F: drivers/input/mouse/alps.*
+
ALTERA MAILBOX DRIVER
M: Ley Foon Tan <lftan@altera.com>
L: nios2-dev@lists.rocketboards.org (moderated for non-subscribers)