Merge remote-tracking branch 'input/next'

author Stephen Rothwell <sfr@canb.auug.org.au>

Mon, 10 Dec 2018 03:15:54 +0000 (14:15 +1100)

committer Stephen Rothwell <sfr@canb.auug.org.au>

Mon, 10 Dec 2018 03:15:54 +0000 (14:15 +1100)
author Stephen Rothwell <sfr@canb.auug.org.au>
Mon, 10 Dec 2018 03:15:54 +0000 (14:15 +1100)
committer Stephen Rothwell <sfr@canb.auug.org.au>
Mon, 10 Dec 2018 03:15:54 +0000 (14:15 +1100)
diff --cc drivers/clk/mmp/clk-of-mmp2.c
Simple merge
diff --cc drivers/input/misc/rotary_encoder.c
Simple merge
diff --cc drivers/input/serio/Kconfig
Simple merge
author	Stephen Rothwell <sfr@canb.auug.org.au>
	Mon, 10 Dec 2018 03:15:54 +0000 (14:15 +1100)
committer	Stephen Rothwell <sfr@canb.auug.org.au>
	Mon, 10 Dec 2018 03:15:54 +0000 (14:15 +1100)
		1	2
drivers/clk/mmp/clk-of-mmp2.c	patch \|	diff1 \|	diff2 \|	blob \| history
drivers/input/misc/rotary_encoder.c	patch \|	diff1 \|	diff2 \|	blob \| history
drivers/input/serio/Kconfig	patch \|	diff1 \|	diff2 \|	blob \| history