diff options
| author | Linus Torvalds | 2013-12-09 09:28:31 -0800 |
|---|---|---|
| committer | Linus Torvalds | 2013-12-09 09:28:31 -0800 |
| commit | 754ac45745711a7ce0067087e5b55a9c277952ad (patch) | |
| tree | 3cdd8a40089365783a6f30aa6fa915b522d6b768 /drivers/ptp | |
| parent | b6db4eb02e135304b820783383844a217dd4886a (diff) | |
| parent | 95f75e91588afecfb0090988393653d21f5d1f91 (diff) | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input
Pull input updates from Dmitry Torokhov:
"An update to ALPS to support devices on Dell XT2 (hopefully working
better this time around and although it is largish it should not
affect any other ALPS devices) and a tiny update to Elantech driver to
support newer devices as well.
Also a coupe of new input event codes have been defined"
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input:
Input: ALPS - add support for DualPoint device on Dell XT2 model
Input: elantech - add support for newer (August 2013) devices
Input: add SW_MUTE_DEVICE switch definition
Input: usbtouchscreen - separate report and transmit buffer size handling
Input: sur40 - suppress false uninitialized variable warning
Input: add key code for ambient light sensor button
Input: keyboard - "keycode & KEY_MAX" changes some keycode values
Diffstat (limited to 'drivers/ptp')
0 files changed, 0 insertions, 0 deletions