Commit 93db6294958f62643a917e44d1abc85440e600cf
Exists in
master
and in
7 other branches
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: (35 commits) Input: add driver for Synaptics I2C touchpad Input: synaptics - add support for reporting x/y resolution Input: ALPS - handle touchpoints buttons correctly Input: gpio-keys - change timer to workqueue Input: ads7846 - pin change interrupt support Input: add support for touchscreen on W90P910 ARM platform Input: appletouch - improve finger detection Input: wacom - clear Intuos4 wheel data when finger leaves proximity Input: ucb1400 - move static function from header into core Input: add driver for EETI touchpanels Input: ads7846 - more detailed model name in sysfs Input: ads7846 - support swapping x and y axes Input: ati_remote2 - use non-atomic bitops Input: introduce lm8323 keypad driver Input: psmouse - ESD workaround fix for OLPC XO touchpad Input: tsc2007 - make sure platform provides get_pendown_state() Input: uinput - flush all pending ff effects before destroying device Input: simplify name handling for certain input handles Input: serio - do not use deprecated dev.power.power_state Input: wacom - add support for Intuos4 tablets ...
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 52 changed files Side-by-side Diff
- Documentation/input/input.txt
- Documentation/input/rotary-encoder.txt
- arch/arm/mach-ep93xx/include/mach/ep93xx_keypad.h
- drivers/char/keyboard.c
- drivers/input/evdev.c
- drivers/input/gameport/fm801-gp.c
- drivers/input/gameport/gameport.c
- drivers/input/joydev.c
- drivers/input/keyboard/Kconfig
- drivers/input/keyboard/Makefile
- drivers/input/keyboard/ep93xx_keypad.c
- drivers/input/keyboard/gpio_keys.c
- drivers/input/keyboard/lm8323.c
- drivers/input/misc/Kconfig
- drivers/input/misc/Makefile
- drivers/input/misc/ati_remote2.c
- drivers/input/misc/dm355evm_keys.c
- drivers/input/misc/rotary_encoder.c
- drivers/input/misc/twl4030-pwrbutton.c
- drivers/input/misc/uinput.c
- drivers/input/mouse/Kconfig
- drivers/input/mouse/Makefile
- drivers/input/mouse/alps.c
- drivers/input/mouse/appletouch.c
- drivers/input/mouse/lifebook.c
- drivers/input/mouse/psmouse-base.c
- drivers/input/mouse/synaptics.c
- drivers/input/mouse/synaptics.h
- drivers/input/mouse/synaptics_i2c.c
- drivers/input/mousedev.c
- drivers/input/serio/i8042.c
- drivers/input/serio/serio.c
- drivers/input/tablet/gtco.c
- drivers/input/tablet/wacom.h
- drivers/input/tablet/wacom_sys.c
- drivers/input/tablet/wacom_wac.c
- drivers/input/tablet/wacom_wac.h
- drivers/input/touchscreen/Kconfig
- drivers/input/touchscreen/Makefile
- drivers/input/touchscreen/ads7846.c
- drivers/input/touchscreen/atmel-wm97xx.c
- drivers/input/touchscreen/eeti_ts.c
- drivers/input/touchscreen/tsc2007.c
- drivers/input/touchscreen/w90p910_ts.c
- drivers/mfd/ucb1400_core.c
- include/linux/gameport.h
- include/linux/i2c/lm8323.h
- include/linux/input.h
- include/linux/rotary_encoder.h
- include/linux/serio.h
- include/linux/spi/ads7846.h
- include/linux/ucb1400.h