tree c54f9b4a4319c56d1a30fa8e53efc7c0585cab4f
parent ea9b5ee31078b027ced5b6e9ec4f2a10bd5e49c0
parent 5444a992b4a73aa5246a432c482b20b89bce93a5
author Linus Torvalds <torvalds@linux-foundation.org> 1520473052 -0800
committer Linus Torvalds <torvalds@linux-foundation.org> 1520473052 -0800

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

Pull input fixes from Dmitry Torokhov:

 - we are reverting patch that was switched touchpad on Lenovo T460P
   over to native RMI because on these boxes BIOS messes up with SMBus
   controller state. We might re-enable it later once SMBus issue is
   resolved

 - disabling interrupts in matrix_keypad driver was racy

 - mms114 now has SPDX header and matching MODULE_LICENSE

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input:
  Revert "Input: synaptics - Lenovo Thinkpad T460p devices should use RMI"
  Input: matrix_keypad - fix race when disabling interrupts
  Input: mms114 - add SPDX identifier
  Input: mms114 - fix license module information