diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2015-11-14 06:41:14 +0100 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2015-11-14 06:41:14 +0100 |
| commit | a30b7ca2894994e4e2f2e06811ee67fa637bca2e (patch) | |
| tree | 515cb6e1fea6da4671d526ad753ce5584ca2fe6e /Makefile | |
| parent | Merge tag 'scsi-misc' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi (diff) | |
| parent | Merge branch 'next' into for-linus (diff) | |
| download | linux-a30b7ca2894994e4e2f2e06811ee67fa637bca2e.tar.xz linux-a30b7ca2894994e4e2f2e06811ee67fa637bca2e.zip | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input
Pull more input updates from Dmitry Torokhov:
"An update to the tsc2005 driver that allows it to also support tsc2004
(basically the same controller, but uses i2c instead of spi bus), and
a couple of bug fixes"
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input:
Input: parkbd - drop bogus __init from parkbd_allocate_serio()
Input: elantech - add Fujitsu Lifebook U745 to force crc_enabled
Input: tsc2004 - add support for tsc2004
Input: tsc200x-core - rename functions and variables
Input: tsc2005 - separate SPI and core functions
Diffstat (limited to 'Makefile')
0 files changed, 0 insertions, 0 deletions