tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
1
fork

Configure Feed

Select the types of activity you want to include in your feed.

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input

Pull input layer fix from Dmitry Torokhov:
"A small tweak for the Synaptics PS/2 touchpad driver"

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input:
Input: synaptics - add min/max quirk for Lenovo S540

Linus Torvalds e64f6384 5879ae5f

+6 -1
+6 -1
drivers/input/mouse/synaptics.c
··· 151 151 1024, 5112, 2024, 4832 152 152 }, 153 153 { 154 + (const char * const []){"LEN2000", NULL}, 155 + {ANY_BOARD_ID, ANY_BOARD_ID}, 156 + 1024, 5113, 2021, 4832 157 + }, 158 + { 154 159 (const char * const []){"LEN2001", NULL}, 155 160 {ANY_BOARD_ID, ANY_BOARD_ID}, 156 161 1024, 5022, 2508, 4832 ··· 196 191 "LEN0045", 197 192 "LEN0047", 198 193 "LEN0049", 199 - "LEN2000", 194 + "LEN2000", /* S540 */ 200 195 "LEN2001", /* Edge E431 */ 201 196 "LEN2002", /* Edge E531 */ 202 197 "LEN2003",