Commit f2e1d89f9b349b3cd914b7c6ec6368632f4ad048
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: (40 commits) Input: use full RCU API Input: remove tsdev interface Input: add support for Blackfin BF54x Keypad controller Input: appletouch - another fix for idle reset logic HWMON: hdaps - switch to using input-polldev Input: add support for SEGA Dreamcast keyboard Input: omap-keyboard - don't pretend we support changing keymap Input: lifebook - fix X and Y axis range Input: usbtouchscreen - add support for GeneralTouch devices Input: fix open count handling in input interfaces Input: keyboard - add CapsShift lock Input: adbhid - produce all CapsLock key events Input: ALPS - add signature for ThinkPad R61 Input: jornada720_kbd - send MSC_SCAN events Input: add support for the HP Jornada 7xx (710/720/728) touchscreen Input: add support for HP Jornada 7xx onboard keyboard Input: add support for HP Jornada onboard keyboard (HP6XX) Input: ucb1400_ts - use schedule_timeout_uninterruptible Input: xpad - fix dependancy on LEDS class Input: auto-select INPUT for MAC_EMUMOUSEBTN option ... Resolved conflicts manually in drivers/hwmon/applesmc.c: converting from a class device to a device and converting to use input-polldev created a few apparently trivial clashes..
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 42 changed files Side-by-side Diff
- Documentation/feature-removal-schedule.txt
- Documentation/kernel-parameters.txt
- arch/blackfin/mach-bf548/boards/ezkit.c
- drivers/char/ec3104_keyb.c
- drivers/hwmon/Kconfig
- drivers/hwmon/ams/ams-input.c
- drivers/hwmon/ams/ams.h
- drivers/hwmon/applesmc.c
- drivers/hwmon/hdaps.c
- drivers/input/Kconfig
- drivers/input/Makefile
- drivers/input/evdev.c
- drivers/input/input-polldev.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/bf54x-keys.c
- drivers/input/keyboard/gpio_keys.c
- drivers/input/keyboard/jornada680_kbd.c
- drivers/input/keyboard/jornada720_kbd.c
- drivers/input/keyboard/maple_keyb.c
- drivers/input/keyboard/omap-keypad.c
- drivers/input/mouse/alps.c
- drivers/input/mouse/appletouch.c
- drivers/input/mouse/lifebook.c
- drivers/input/mouse/psmouse-base.c
- drivers/input/mousedev.c
- drivers/input/serio/i8042.c
- drivers/input/touchscreen/Kconfig
- drivers/input/touchscreen/Makefile
- drivers/input/touchscreen/jornada720_ts.c
- drivers/input/touchscreen/ucb1400_ts.c
- drivers/input/touchscreen/usbtouchscreen.c
- drivers/input/tsdev.c
- drivers/macintosh/Kconfig
- drivers/macintosh/adbhid.c
- include/asm-blackfin/mach-bf548/bf54x_keys.h
- include/linux/gpio_keys.h
- include/linux/input.h
- include/linux/keyboard.h