diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2018-07-27 19:53:45 +0300 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2018-07-27 19:53:45 +0300 |
| commit | 49b1622bdb0be9b1cb20d36c64a635bcc5981c4b (patch) | |
| tree | d71ec999eb12ec1f556bb8ffc4f8551d296af654 /fs/btrfs | |
| parent | 3ebb6fb03dad87cfd74d5bcd31b9dbcf3c82c89c (diff) | |
| parent | 384cf4285b34e08917e3e66603382f2b0c4f6e1b (diff) | |
| download | linux-49b1622bdb0be9b1cb20d36c64a635bcc5981c4b.tar.xz | |
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
Diffstat (limited to 'fs/btrfs')
0 files changed, 0 insertions, 0 deletions