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 a few fixups for the input subsystem. Changelog: --------- Bjorn Helgaas (1): Input: sirfsoc-onkey - fix GPL v2 license string typo Dmitry Torokhov (1): Input: fix defuzzing logic Felipe Balbi (1): Input: ti_am335x_tsc - warn about incorrect spelling Hans de Goede (1): Input: synaptics - add min/max quirk for pnp-id LEN2002 (Edge E531) Jiri Kosina (1): Input: i8042 - add Acer Aspire 5710 to nomux blacklist Peter Hutterer (1): Input: document INPUT_PROP_TOPBUTTONPAD Ping Cheng (1): Input: wacom - cleanup multitouch code when touch_max is 2 Tobias Klauser (1): Input: st-keyscan - fix 'defined but not used' compiler warnings Diffstat: -------- Documentation/input/event-codes.txt | 13 +++++++++++++ drivers/input/input.c | 6 ++++-- drivers/input/keyboard/st-keyscan.c | 2 ++ drivers/input/misc/sirfsoc-onkey.c | 2 +- drivers/input/mouse/synaptics.c | 5 +++-- drivers/input/serio/i8042-x86ia64io.h | 7 +++++++ drivers/input/tablet/wacom_wac.c | 28 +++++++--------------------- drivers/input/touchscreen/ti_am335x_tsc.c | 5 ++++- 8 files changed, 41 insertions(+), 27 deletions(-) -- Dmitry
Attachment:
signature.asc
Description: Digital signature