Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input
Pull input subsystem updates from Dmitry Torokhov: "A few small fixups for cyttsp, wacom and xpad drivers" * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input: Input: xpad - fix for "Mad Catz Street Fighter IV FightPad" controllers Input: wacom - add a new stylus (0x100802) for Intuos5 and Cintiqs Input: add missing dependencies on CONFIG_HAS_IOMEM Input: cyttsp - fix swapped mfg_stat and mfg_cmd registers Input: cyttsp - add missing handshake Input: cyttsp - fix memcpy size param
No related branches found
No related tags found
Showing
- drivers/input/joystick/xpad.c 1 addition, 1 deletiondrivers/input/joystick/xpad.c
- drivers/input/keyboard/Kconfig 1 addition, 0 deletionsdrivers/input/keyboard/Kconfig
- drivers/input/serio/Kconfig 1 addition, 0 deletionsdrivers/input/serio/Kconfig
- drivers/input/tablet/wacom_wac.c 2 additions, 0 deletionsdrivers/input/tablet/wacom_wac.c
- drivers/input/touchscreen/cyttsp_core.c 21 additions, 7 deletionsdrivers/input/touchscreen/cyttsp_core.c
- drivers/input/touchscreen/cyttsp_core.h 1 addition, 1 deletiondrivers/input/touchscreen/cyttsp_core.h
Loading
Please register or sign in to comment