Merge branch 'next' into for-linus

author Dmitry Torokhov <[email protected]>

Mon, 4 Sep 2017 16:22:54 +0000 (09:22 -0700)

committer Dmitry Torokhov <[email protected]>

Mon, 4 Sep 2017 16:22:54 +0000 (09:22 -0700)
author Dmitry Torokhov <[email protected]>
Mon, 4 Sep 2017 16:22:54 +0000 (09:22 -0700)
committer Dmitry Torokhov <[email protected]>
Mon, 4 Sep 2017 16:22:54 +0000 (09:22 -0700)
diff --cc drivers/input/joystick/xpad.c
Simple merge
diff --cc drivers/input/mouse/elan_i2c_core.c
Simple merge
author	Dmitry Torokhov <[email protected]>
	Mon, 4 Sep 2017 16:22:54 +0000 (09:22 -0700)
committer	Dmitry Torokhov <[email protected]>
	Mon, 4 Sep 2017 16:22:54 +0000 (09:22 -0700)
		1	2
drivers/input/joystick/xpad.c	patch \|	diff1 \|	diff2 \|	blob \| history
drivers/input/mouse/elan_i2c_core.c	patch \|	diff1 \|	diff2 \|	blob \| history