Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input
Pull input updates from Dmitry Torokhov: "Except for the largish change to the ALPS driver adding "Dolphin V1" support and Wacom getting a new signature of yet another device, the rest are straightforward driver fixes." * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input: Input: mms114 - Fix regulator enable and disable paths Input: ads7864 - check return value of regulator enable Input: tc3589x-keypad - fix keymap size Input: wacom - add support for 0x10d Input: ALPS - update documentation for recent touchpad driver mods Input: ALPS - add "Dolphin V1" touchpad support Input: ALPS - remove unused argument to alps_enter_command_mode() Input: cypress_ps2 - fix trackpadi found in Dell XPS12
Showing
- Documentation/input/alps.txt 60 additions, 7 deletionsDocumentation/input/alps.txt
- drivers/input/keyboard/tc3589x-keypad.c 4 additions, 4 deletionsdrivers/input/keyboard/tc3589x-keypad.c
- drivers/input/mouse/alps.c 72 additions, 13 deletionsdrivers/input/mouse/alps.c
- drivers/input/mouse/alps.h 1 addition, 0 deletionsdrivers/input/mouse/alps.h
- drivers/input/mouse/cypress_ps2.c 13 additions, 6 deletionsdrivers/input/mouse/cypress_ps2.c
- drivers/input/tablet/wacom_wac.c 4 additions, 0 deletionsdrivers/input/tablet/wacom_wac.c
- drivers/input/touchscreen/ads7846.c 6 additions, 1 deletiondrivers/input/touchscreen/ads7846.c
- drivers/input/touchscreen/mms114.c 25 additions, 9 deletionsdrivers/input/touchscreen/mms114.c
Loading
Please register or sign in to comment