Messages in this thread | | | Date | Tue, 11 Jan 2011 22:09:55 -0800 | From | Dmitry Torokhov <> | Subject | [git pull] Input updates for 2.6.38-rc0 (round 2) |
| |
Hi Linus,
Please pull from:
git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input.git for-linus or master.kernel.org:/pub/scm/linux/kernel/git/dtor/input.git for-linus
to receive 2nd round of updates for the input subsystem. One driver out, one driver in, and a bunch of minor fixes.
Thanks!
Changelog: ---------
Alexander Stein (1): Input: fix force feedback capability query example
Fabien Marteau (1): Input: add Austria Microsystem AS5011 joystick driver
Jamie Iles (1): Input: remove aaed2000 keyboard driver
Jekyll Lai (1): Input: add SW_ROTATE_LOCK switch type
Jiri Kosina (1): Input: i8042 - introduce 'notimeout' blacklist for Dell Vostro V13
Mark Brown (5): Input: ad7879 - convert I2C to dev_pm_ops Input: eeti_ts - convert to dev_pm_ops Input: mcs5000_ts - convert to dev_pm_ops Input: migor_ts - convert to dev_pm_ops Input: cy8ctmg110_ts - Convert to dev_pm_ops
Ping Cheng (1): Input: wacom_w8001 - add single-touch support
Diffstat: --------
Documentation/input/ff.txt | 4 +- Documentation/kernel-parameters.txt | 1 + drivers/input/joystick/Kconfig | 10 + drivers/input/joystick/Makefile | 1 + drivers/input/joystick/as5011.c | 367 +++++++++++++++++++++++++++++ drivers/input/keyboard/Kconfig | 12 - drivers/input/keyboard/Makefile | 1 - drivers/input/keyboard/aaed2000_kbd.c | 186 --------------- drivers/input/serio/i8042-x86ia64io.h | 21 ++ drivers/input/serio/i8042.c | 6 +- drivers/input/touchscreen/ad7879-i2c.c | 17 +- drivers/input/touchscreen/cy8ctmg110_ts.c | 15 +- drivers/input/touchscreen/eeti_ts.c | 16 +- drivers/input/touchscreen/mcs5000_ts.c | 17 +- drivers/input/touchscreen/migor_ts.c | 12 +- drivers/input/touchscreen/wacom_w8001.c | 182 ++++++++++++--- include/linux/input.h | 1 + include/linux/input/as5011.h | 20 ++ 18 files changed, 624 insertions(+), 265 deletions(-) create mode 100644 drivers/input/joystick/as5011.c delete mode 100644 drivers/input/keyboard/aaed2000_kbd.c create mode 100644 include/linux/input/as5011.h
-- Dmitry
| |