projects / openwrt / staging / blogic.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 189addc 413d373)
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)
commit99378fd26803328cbab64ae60fa98e1394d07a6d
tree1ab2771c56963fec8669ac87c7058c84345365c4tree | snapshot
parent189addce85330208bea50ea7f1483b58822e93cfcommit | diff
parent413d37326700aaf708730b940b04192c36e13ef4commit | diff
Merge branch 'for-linus' of git://git./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
John Crispins staging tree