Revision 99378fd26803328cbab64ae60fa98e1394d07a6d authored by Linus Torvalds on 09 February 2017, 19:58:05 UTC, committed by Linus Torvalds on 09 February 2017, 19:58:05 UTC
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