Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input
Pull input updates from Dmitry Torokhov: - several new key mappings for HID - a host of new ACPI IDs used to identify Elan touchpads in Lenovo laptops * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input: Input: snvs_pwrkey - initialize necessary driver data before enabling IRQ HID: input: add mapping for "Toggle Display" key HID: input: add mapping for "Full Screen" key HID: input: add mapping for keyboard Brightness Up/Down/Toggle keys HID: input: add mapping for Expose/Overview key HID: input: fix mapping of aspect ratio key [media] doc-rst: switch to new names for Full Screen/Aspect keys Input: document meanings of KEY_SCREEN and KEY_ZOOM Input: elan_i2c - add hardware ID for multiple Lenovo laptops
Showing
- Documentation/media/uapi/rc/rc-tables.rst 2 additions, 2 deletionsDocumentation/media/uapi/rc/rc-tables.rst
- drivers/hid/hid-input.c 16 additions, 1 deletiondrivers/hid/hid-input.c
- drivers/input/keyboard/snvs_pwrkey.c 3 additions, 3 deletionsdrivers/input/keyboard/snvs_pwrkey.c
- drivers/input/mouse/elan_i2c_core.c 25 additions, 0 deletionsdrivers/input/mouse/elan_i2c_core.c
- include/uapi/linux/input-event-codes.h 4 additions, 2 deletionsinclude/uapi/linux/input-event-codes.h
Please register or sign in to comment