Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input: Input: ads7846 - SPI_CPHA mode bugfix Input: ads7846 - document that it handles tsc2046 too Input: input-polldev - add module info Input: ucb1x00-ts - remove commented out code Input: ucb1400_ts - use sched_setscheduler() Input: ALPS - force stream mode Input: iforce - minor clean-ups Input: iforce - fix force feedback not working Input: adbhid - do not access input_dev->private directly Input: logips2pp - add type 72 (PS/2 TrackMan Marble)
Showing
- drivers/input/joystick/iforce/iforce-main.c 1 addition, 3 deletionsdrivers/input/joystick/iforce/iforce-main.c
- drivers/input/joystick/iforce/iforce-packets.c 8 additions, 2 deletionsdrivers/input/joystick/iforce/iforce-packets.c
- drivers/input/joystick/iforce/iforce-usb.c 3 additions, 2 deletionsdrivers/input/joystick/iforce/iforce-usb.c
- drivers/input/misc/input-polldev.c 5 additions, 0 deletionsdrivers/input/misc/input-polldev.c
- drivers/input/mouse/alps.c 31 additions, 27 deletionsdrivers/input/mouse/alps.c
- drivers/input/mouse/logips2pp.c 1 addition, 0 deletionsdrivers/input/mouse/logips2pp.c
- drivers/input/touchscreen/Kconfig 4 additions, 4 deletionsdrivers/input/touchscreen/Kconfig
- drivers/input/touchscreen/ads7846.c 2 additions, 1 deletiondrivers/input/touchscreen/ads7846.c
- drivers/input/touchscreen/ucb1400_ts.c 2 additions, 2 deletionsdrivers/input/touchscreen/ucb1400_ts.c
- drivers/macintosh/adbhid.c 8 additions, 8 deletionsdrivers/macintosh/adbhid.c
- drivers/mfd/ucb1x00-ts.c 1 addition, 10 deletionsdrivers/mfd/ucb1x00-ts.c
Loading
Please register or sign in to comment