diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2018-12-21 09:09:30 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2018-12-21 09:09:30 -0800 |
| commit | 0b517333721c1b7a740e54b1cbe78a14884d51e7 (patch) | |
| tree | b9af16849a0aa7a581e841c73d28519d367a9f5c /Makefile | |
| parent | bc380733a5e77ccc3b4d4622595e42f1b0902d66 (diff) | |
| parent | 7a71712293ba303aad928f580b89addb0be2892e (diff) | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input
Pull input fixes from Dmitry Torokhov:
"Switching a few devices with Synaptics over to SMbus and disabling
SMbus on a couple devices with Elan touchpads as they need more
plumbing on PS/2 side"
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input:
Input: synaptics - enable SMBus for HP EliteBook 840 G4
Input: elantech - disable elan-i2c for P52 and P72
Input: synaptics - enable RMI on ThinkPad T560
Input: omap-keypad - fix idle configuration to not block SoC idle states
Diffstat (limited to 'Makefile')
0 files changed, 0 insertions, 0 deletions