Merge branch 'next' into for-linus

author Dmitry Torokhov <[email protected]>

Thu, 16 Aug 2018 18:10:56 +0000 (11:10 -0700)

committer Dmitry Torokhov <[email protected]>

Thu, 16 Aug 2018 18:10:56 +0000 (11:10 -0700)
author Dmitry Torokhov <[email protected]>
Thu, 16 Aug 2018 18:10:56 +0000 (11:10 -0700)
committer Dmitry Torokhov <[email protected]>
Thu, 16 Aug 2018 18:10:56 +0000 (11:10 -0700)
diff --cc MAINTAINERS
Simple merge
diff --cc drivers/input/mouse/elantech.c
Simple merge
author	Dmitry Torokhov <[email protected]>
	Thu, 16 Aug 2018 18:10:56 +0000 (11:10 -0700)
committer	Dmitry Torokhov <[email protected]>
	Thu, 16 Aug 2018 18:10:56 +0000 (11:10 -0700)
		1	2
MAINTAINERS	patch \|	diff1 \|	diff2 \|	blob \| history
drivers/input/mouse/elantech.c	patch \|	diff1 \|	diff2 \|	blob \| history