diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2017-06-09 22:28:33 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2017-06-09 22:28:33 -0700 |
| commit | c7a1aefc47cc17b754180a18f77f508f2f210d2c (patch) | |
| tree | a3041c096874d4aabfcd165e7b2a4945694b0fbf /drivers/net/ethernet/intel/i40evf/i40e_txrx.c | |
| parent | 2833b7e913327855c2c0c842c37ca1d90602139e (diff) | |
| parent | a0897d5f2c2d884d20840c82aea517e8a7801441 (diff) | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input
Pull input fixes from Dmitry Torokhov:
- mark "guest" RMI device as pass-through port to avoid "phantom" ALPS
toouchpad on newer Lenovo Carbons
- add two more laptops to the Elantech's lists of devices using CRC
mode
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input:
Input: synaptics-rmi4 - register F03 port as pass-through serio
Input: elantech - add Fujitsu Lifebook E546/E557 to force crc_enabled
Diffstat (limited to 'drivers/net/ethernet/intel/i40evf/i40e_txrx.c')
0 files changed, 0 insertions, 0 deletions