Commit d01d0756f75e7a5b4b43764ad45b83c4340f11d6
Merge branch 'next' into for-linus
Warning! This is a large diff.
To preserve performance the diff is not shown. Please, download the diff as plain diff or email patch instead.
If you still want to see the diff click this link
Showing 56 changed files Side-by-side Diff
- Documentation/input/multi-touch-protocol.txt
- arch/arm/plat-samsung/include/plat/keypad.h
- drivers/char/keyboard.c
- drivers/hid/hid-core.c
- drivers/hid/hid-ids.h
- drivers/hid/hid-input.c
- drivers/input/evdev.c
- drivers/input/input.c
- drivers/input/joydev.c
- drivers/input/joystick/xpad.c
- drivers/input/keyboard/Kconfig
- drivers/input/keyboard/Makefile
- drivers/input/keyboard/adp5588-keys.c
- drivers/input/keyboard/gpio_keys.c
- drivers/input/keyboard/lm8323.c
- drivers/input/keyboard/matrix_keypad.c
- drivers/input/keyboard/mcs_touchkey.c
- drivers/input/keyboard/samsung-keypad.c
- drivers/input/misc/Kconfig
- drivers/input/misc/Makefile
- drivers/input/misc/adxl34x-i2c.c
- drivers/input/misc/adxl34x-spi.c
- drivers/input/misc/adxl34x.c
- drivers/input/misc/adxl34x.h
- drivers/input/misc/atlas_btns.c
- drivers/input/misc/pwm-beeper.c
- drivers/input/misc/twl4030-pwrbutton.c
- drivers/input/misc/wistron_btns.c
- drivers/input/mouse/bcm5974.c
- drivers/input/mouse/synaptics.c
- drivers/input/mousedev.c
- drivers/input/serio/i8042-ppcio.h
- drivers/input/serio/i8042.c
- drivers/input/tablet/wacom_wac.c
- drivers/input/tablet/wacom_wac.h
- drivers/input/touchscreen/Kconfig
- drivers/input/touchscreen/Makefile
- drivers/input/touchscreen/ad7879-i2c.c
- drivers/input/touchscreen/ad7879-spi.c
- drivers/input/touchscreen/ad7879.c
- drivers/input/touchscreen/ad7879.h
- drivers/input/touchscreen/ads7846.c
- drivers/input/touchscreen/cy8ctmg110_ts.c
- drivers/input/touchscreen/mcs5000_ts.c
- drivers/input/touchscreen/qt602240_ts.c
- drivers/input/touchscreen/tps6507x-ts.c
- drivers/input/touchscreen/usbtouchscreen.c
- include/linux/i2c/adp5588.h
- include/linux/i2c/mcs.h
- include/linux/i2c/mcs5000_ts.h
- include/linux/i2c/qt602240_ts.h
- include/linux/input.h
- include/linux/input/adxl34x.h
- include/linux/input/cy8ctmg110_pdata.h
- include/linux/input/matrix_keypad.h
- include/linux/spi/ads7846.h