summaryrefslogtreecommitdiff
path: root/drivers/input/serio/i8042.h
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2014-10-19 23:40:24 +0400
committerLinus Torvalds <torvalds@linux-foundation.org>2014-10-19 23:40:24 +0400
commitfb378df57d5c0e92e935893b81be168897632374 (patch)
tree938158b61bf8c5e13dc6b9c836dbcaf10c03e8f2 /drivers/input/serio/i8042.h
parent2eb7f910c158fd675ab33aff67904512779996e8 (diff)
parent4dfb15cd5aaa6682e93854a74b394a1c95b82621 (diff)
downloadlinux-fb378df57d5c0e92e935893b81be168897632374.tar.xz
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input
Pull second round of input updates from Dmitry Torokhov: "Mostly simple bug fixes, although we do have one brand new driver for Microchip AR1021 i2c touchscreen. Also there is the change to stop trying to use i8042 active multiplexing by default (it is still possible to activate it via i8042.nomux=0 on boxes that implement it)" * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input: Input: xpad - add Thrustmaster as Xbox 360 controller vendor Input: xpad - add USB ID for Thrustmaster Ferrari 458 Racing Wheel Input: max77693-haptic - fix state check in imax77693_haptic_disable() Input: xen-kbdfront - free grant table entry in xenkbd_disconnect_backend Input: alps - fix v4 button press recognition Input: i8042 - disable active multiplexing by default Input: i8042 - add noloop quirk for Asus X750LN Input: synaptics - gate forcepad support by DMI check Input: Add Microchip AR1021 i2c touchscreen Input: cros_ec_keyb - add of match table Input: serio - avoid negative serio device numbers Input: avoid negative input device numbers Input: automatically set EV_ABS bit in input_set_abs_params Input: adp5588-keys - cancel workqueue in failure path Input: opencores-kbd - switch to using managed resources Input: evdev - fix EVIOCG{type} ioctl
Diffstat (limited to 'drivers/input/serio/i8042.h')
0 files changed, 0 insertions, 0 deletions