diff options
| author |   Linus Torvalds <torvalds@linux-foundation.org> | 2018-01-25 17:30:47 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2018-01-25 17:30:47 -0800 |
| commit | 993ca2068b043dc3c933a8a4fe1052b77fe63f10 (patch) | |
| tree | ea20f515820b7fe08e6a602a793c9e43120b386e /kernel/time/hrtimer.c | |
| parent | orangefs: fix deadlock; do not write i_size in read_iter (diff) | |
| parent | Revert "Input: synaptics_rmi4 - use devm_device_add_group() for attributes in F01" (diff) | |
| download | linux-dev-993ca2068b043dc3c933a8a4fe1052b77fe63f10.tar.xz linux-dev-993ca2068b043dc3c933a8a4fe1052b77fe63f10.zip | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input
Pull input fixes from Dmitry Torokhov:
"The main item is that we try to better handle the newer trackpoints on
Lenovo devices that are now being produced by Elan/ALPS/NXP and only
implement a small subset of the original IBM trackpoint controls"
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input:
Revert "Input: synaptics_rmi4 - use devm_device_add_group() for attributes in F01"
Input: trackpoint - only expose supported controls for Elan, ALPS and NXP
Input: trackpoint - force 3 buttons if 0 button is reported
Input: xpad - add support for PDP Xbox One controllers
Input: stmfts,s6sy671 - add SPDX identifier
Diffstat (limited to 'kernel/time/hrtimer.c')
0 files changed, 0 insertions, 0 deletions