diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2017-08-17 13:45:44 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2017-08-17 13:45:44 -0700 |
| commit | 440105d3c958cf10b5900fac9d4632d47d57a0cc (patch) | |
| tree | e89313c0979b050f985f252c76ad6613cc5a91ad /drivers/sn | |
| parent | 3bc6c906eacec34f0d8dcfd3c7e4513edf152297 (diff) | |
| parent | 76988690402dde2880bfe06ecccf381d48ba8e1c (diff) | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input
Pull input fixes from Dmitry Torokhov.
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input:
Input: elan_i2c - Add antoher Lenovo ACPI ID for upcoming Lenovo NB
Input: elan_i2c - add ELAN0608 to the ACPI table
Input: trackpoint - assume 3 buttons when buttons detection fails
Diffstat (limited to 'drivers/sn')
0 files changed, 0 insertions, 0 deletions