]> git.proxmox.com Git - mirror_ubuntu-kernels.git/commit
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input
authorLinus Torvalds <torvalds@linux-foundation.org>
Sat, 19 Dec 2015 17:51:11 +0000 (09:51 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Sat, 19 Dec 2015 17:51:11 +0000 (09:51 -0800)
commit632f8577d694efa4f2968be32c44e79f7e2ed2cd
tree8ef8dc992a7c9d25e2045fc8fb3ece0b573e1800
parent1eab0e42450c6038e2bb17da438370fe639973f3
parent478e5ed1c3f6928ece7fffd712ba728b1f92217d
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input

Pull input fixes from Dmitry Torokhov:
 "Just a few assorted driver fixes"

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input:
  Input: elants_i2c - fix wake-on-touch
  Input: elan_i2c - set input device's vendor and product IDs
  Input: sun4i-lradc-keys - fix typo in binding documentation
  Input: atmel_mxt_ts - add maxtouch to I2C table for module autoload
  Input: arizona-haptic - fix disabling of haptics device
  Input: aiptek - fix crash on detecting device without endpoints
  Input: atmel_mxt_ts - add generic platform data for Chromebooks
  Input: parkbd - clear unused function pointers
  Input: walkera0701 - clear unused function pointers
  Input: turbografx - clear unused function pointers
  Input: gamecon - clear unused function pointers
  Input: db9 - clear unused function pointers
drivers/input/joystick/walkera0701.c