Merge branch 'master' into for-4.20/upstream-fixes

author Jiri Kosina <[email protected]>

Tue, 6 Nov 2018 12:57:02 +0000 (13:57 +0100)

committer Jiri Kosina <[email protected]>

Tue, 6 Nov 2018 12:57:02 +0000 (13:57 +0100)
author Jiri Kosina <[email protected]>
Tue, 6 Nov 2018 12:57:02 +0000 (13:57 +0100)
committer Jiri Kosina <[email protected]>
Tue, 6 Nov 2018 12:57:02 +0000 (13:57 +0100)
diff --cc MAINTAINERS
Simple merge
diff --cc drivers/hid/i2c-hid/i2c-hid-dmi-quirks.c
Simple merge
author	Jiri Kosina <[email protected]>
	Tue, 6 Nov 2018 12:57:02 +0000 (13:57 +0100)
committer	Jiri Kosina <[email protected]>
	Tue, 6 Nov 2018 12:57:02 +0000 (13:57 +0100)
		1	2
MAINTAINERS	patch \|	diff1 \|	diff2 \|	blob \| history
drivers/hid/i2c-hid/i2c-hid-dmi-quirks.c	patch \|	diff1 \|	diff2 \|	blob \| history