Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input
Pull input updates from Dmitry Torokhov: "This fixes recent regression where /dev/input/mice got assigned wrong device node which messed up setups with static /dev, and a regression in ads7846 GPIO debounce setup." * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input: ARM - OMAP: ads7846: fix pendown debounce setting Input: ads7846 - enable pendown GPIO debounce time setting Input: mousedev - move /dev/input/mice to the correct minor Input: MT - document new 'flags' argument of input_mt_init_slots()
Showing
- arch/arm/mach-omap2/common-board-devices.c 20 additions, 14 deletionsarch/arm/mach-omap2/common-board-devices.c
- drivers/input/input-mt.c 4 additions, 0 deletionsdrivers/input/input-mt.c
- drivers/input/mousedev.c 2 additions, 2 deletionsdrivers/input/mousedev.c
- drivers/input/touchscreen/ads7846.c 5 additions, 1 deletiondrivers/input/touchscreen/ads7846.c
- include/linux/spi/ads7846.h 3 additions, 2 deletionsinclude/linux/spi/ads7846.h
Please register or sign in to comment