]> git.baikalelectronics.ru Git - kernel.git/commit
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input
authorLinus Torvalds <torvalds@linux-foundation.org>
Thu, 9 Feb 2017 19:58:05 +0000 (11:58 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Thu, 9 Feb 2017 19:58:05 +0000 (11:58 -0800)
commitc57dc4b137c892f4a39f0c00ec83012c905617cf
tree1ab2771c56963fec8669ac87c7058c84345365c4
parent31b5ec7ef74c979f0dac588c8da73bbedafbd13b
parent9a115bbc7a1f687856f79572a26ab8b6a698be4e
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input

Pull input fixes from Dmitry Torokhov:
 "A fix for a crash in uinput, and a fix for build errors when HID-RMI
  is built-in but SERIO is a module"

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input:
  Input: synaptics-rmi4 - select 'SERIO' when needed
  Input: uinput - fix crash when mixing old and new init style