tree 7c89754b3e58b246dd357f2b3a6add6f352511ed
parent 03daa36f089f31002a2d0fb22088d3ebe3e28d98
parent 324ae0958cab5ccdf2851ef0348ba1cb8ad4e34a
author Linus Torvalds <torvalds@linux-foundation.org> 1478370371 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1478370371 -0700

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

Pull input subsystem updates from Dmitry Torokhov.

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input:
  Input: psmouse - cleanup Focaltech code
  Input: i8042 - add XMG C504 to keyboard reset table