diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2014-09-03 17:26:12 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2014-09-03 17:26:12 -0700 |
| commit | 44bf091f508913c1c35e70ea96430454c95c78f1 (patch) | |
| tree | 2977ab0e9608e5cade47040378217e07b1f4716d /init/main.c | |
| parent | cce15667ae3f50c5ed940a52f7b1874a00b64a26 (diff) | |
| parent | a2418fc4a13b5da8d007a038c0a6a50a54edfabd (diff) | |
| download | linux-44bf091f508913c1c35e70ea96430454c95c78f1.tar.bz2 | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input
Pull input subsystem updates from Dmitry Torokhov:
"A fix for MT breakage, enhancement to Elantech PS/2 driver and a
couple of assorted fixes"
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input:
Input: elantech - add support for trackpoint found on some v3 models
Input: elantech - reset the device when elantech probe fails
Input: ALPS - suppress message about 'Unknown touchpad'
Input: fix used slots detection breakage
Input: sparc - i8042-sparcio.h: fix unused kbd_res warning
Input: atmel_mxt_ts - improve description of gpio-keymap property
Diffstat (limited to 'init/main.c')
0 files changed, 0 insertions, 0 deletions