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: add SW_ROTATE_LOCK switch type Input: fix force feedback capability query example Input: wacom_w8001 - add single-touch support Input: add Austria Microsystem AS5011 joystick driver Input: remove aaed2000 keyboard driver Input: i8042 - introduce 'notimeout' blacklist for Dell Vostro V13 Input: cy8ctmg110_ts - Convert to dev_pm_ops Input: migor_ts - convert to dev_pm_ops Input: mcs5000_ts - convert to dev_pm_ops Input: eeti_ts - convert to dev_pm_ops Input: ad7879 - convert I2C to dev_pm_ops
Showing
- Documentation/input/ff.txt 3 additions, 1 deletionDocumentation/input/ff.txt
- Documentation/kernel-parameters.txt 1 addition, 0 deletionsDocumentation/kernel-parameters.txt
- drivers/input/joystick/Kconfig 10 additions, 0 deletionsdrivers/input/joystick/Kconfig
- drivers/input/joystick/Makefile 1 addition, 0 deletionsdrivers/input/joystick/Makefile
- drivers/input/joystick/as5011.c 367 additions, 0 deletionsdrivers/input/joystick/as5011.c
- drivers/input/keyboard/Kconfig 0 additions, 12 deletionsdrivers/input/keyboard/Kconfig
- drivers/input/keyboard/Makefile 0 additions, 1 deletiondrivers/input/keyboard/Makefile
- drivers/input/keyboard/aaed2000_kbd.c 0 additions, 186 deletionsdrivers/input/keyboard/aaed2000_kbd.c
- drivers/input/serio/i8042-x86ia64io.h 21 additions, 0 deletionsdrivers/input/serio/i8042-x86ia64io.h
- drivers/input/serio/i8042.c 5 additions, 1 deletiondrivers/input/serio/i8042.c
- drivers/input/touchscreen/ad7879-i2c.c 10 additions, 7 deletionsdrivers/input/touchscreen/ad7879-i2c.c
- drivers/input/touchscreen/cy8ctmg110_ts.c 9 additions, 6 deletionsdrivers/input/touchscreen/cy8ctmg110_ts.c
- drivers/input/touchscreen/eeti_ts.c 9 additions, 7 deletionsdrivers/input/touchscreen/eeti_ts.c
- drivers/input/touchscreen/mcs5000_ts.c 10 additions, 7 deletionsdrivers/input/touchscreen/mcs5000_ts.c
- drivers/input/touchscreen/migor_ts.c 8 additions, 4 deletionsdrivers/input/touchscreen/migor_ts.c
- drivers/input/touchscreen/wacom_w8001.c 149 additions, 33 deletionsdrivers/input/touchscreen/wacom_w8001.c
- include/linux/input.h 1 addition, 0 deletionsinclude/linux/input.h
- include/linux/input/as5011.h 20 additions, 0 deletionsinclude/linux/input/as5011.h
Please register or sign in to comment