Merge tag 'v4.17-rc6' into next

author Dmitry Torokhov <[email protected]>

Thu, 24 May 2018 16:30:15 +0000 (09:30 -0700)

committer Dmitry Torokhov <[email protected]>

Thu, 24 May 2018 16:30:15 +0000 (09:30 -0700)
author Dmitry Torokhov <[email protected]>
Thu, 24 May 2018 16:30:15 +0000 (09:30 -0700)
committer Dmitry Torokhov <[email protected]>
Thu, 24 May 2018 16:30:15 +0000 (09:30 -0700)
diff --cc MAINTAINERS
Simple merge
diff --cc drivers/input/joystick/xpad.c
Simple merge
diff --cc drivers/input/mouse/alps.c
Simple merge
diff --cc drivers/input/touchscreen/Kconfig
Simple merge
author	Dmitry Torokhov <[email protected]>
	Thu, 24 May 2018 16:30:15 +0000 (09:30 -0700)
committer	Dmitry Torokhov <[email protected]>
	Thu, 24 May 2018 16:30:15 +0000 (09:30 -0700)
		1	2
MAINTAINERS	patch \|	diff1 \|	diff2 \|	blob \| history
drivers/input/joystick/xpad.c	patch \|	diff1 \|	diff2 \|	blob \| history
drivers/input/mouse/alps.c	patch \|	diff1 \|	diff2 \|	blob \| history
drivers/input/touchscreen/Kconfig	patch \|	diff1 \|	diff2 \|	blob \| history