projects / openwrt / staging / blogic.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: bc38073 7a71712)
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input
authorLinus Torvalds <[email protected]>
Fri, 21 Dec 2018 17:09:30 +0000 (09:09 -0800)
committerLinus Torvalds <[email protected]>
Fri, 21 Dec 2018 17:09:30 +0000 (09:09 -0800)
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

1  2 
drivers/input/keyboard/omap4-keypad.c patch | diff1 | diff2 | blob | history

diff --cc drivers/input/keyboard/omap4-keypad.c
Simple merge
John Crispins staging tree