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 fixes from Dmitry Torokhov:

- a couple of new device IDs added to Elan i2c touchpad controller
driver

- another entry in i8042 reset quirk list

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input:
Input: i8042 - add Lenovo LaVie Z to the i8042 reset list
Input: elan_i2c - add another ACPI ID for Lenovo Ideapad 330-15AST
MAINTAINERS: Add file patterns for serio device tree bindings
Input: elan_i2c - add ACPI ID for lenovo ideapad 330

Linus Torvalds 49b1622b 3ebb6fb0

+10
+1
MAINTAINERS
··· 7095 7095 F: include/uapi/linux/input-event-codes.h 7096 7096 F: include/linux/input/ 7097 7097 F: Documentation/devicetree/bindings/input/ 7098 + F: Documentation/devicetree/bindings/serio/ 7098 7099 F: Documentation/input/ 7099 7100 7100 7101 INPUT MULTITOUCH (MT) PROTOCOL
+2
drivers/input/mouse/elan_i2c_core.c
··· 1346 1346 { "ELAN0611", 0 }, 1347 1347 { "ELAN0612", 0 }, 1348 1348 { "ELAN0618", 0 }, 1349 + { "ELAN061D", 0 }, 1350 + { "ELAN0622", 0 }, 1349 1351 { "ELAN1000", 0 }, 1350 1352 { } 1351 1353 };
+7
drivers/input/serio/i8042-x86ia64io.h
··· 527 527 DMI_MATCH(DMI_PRODUCT_NAME, "N24_25BU"), 528 528 }, 529 529 }, 530 + { 531 + /* Lenovo LaVie Z */ 532 + .matches = { 533 + DMI_MATCH(DMI_SYS_VENDOR, "LENOVO"), 534 + DMI_MATCH(DMI_PRODUCT_VERSION, "Lenovo LaVie Z"), 535 + }, 536 + }, 530 537 { } 531 538 }; 532 539