tree d71ec999eb12ec1f556bb8ffc4f8551d296af654
parent 3ebb6fb03dad87cfd74d5bcd31b9dbcf3c82c89c
parent 384cf4285b34e08917e3e66603382f2b0c4f6e1b
author Linus Torvalds <torvalds@linux-foundation.org> 1532710425 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1532710425 -0700

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