Merge branch 'for-5.3/uclogic' into for-linus

author Jiri Kosina <[email protected]>

Tue, 9 Jul 2019 23:40:23 +0000 (01:40 +0200)

committer Jiri Kosina <[email protected]>

Tue, 9 Jul 2019 23:40:23 +0000 (01:40 +0200)
author Jiri Kosina <[email protected]>
Tue, 9 Jul 2019 23:40:23 +0000 (01:40 +0200)
committer Jiri Kosina <[email protected]>
Tue, 9 Jul 2019 23:40:23 +0000 (01:40 +0200)
diff --cc drivers/hid/hid-ids.h
Simple merge
diff --cc drivers/hid/hid-uclogic-core.c
Simple merge
diff --cc drivers/hid/hid-uclogic-params.c
Simple merge
author	Jiri Kosina <[email protected]>
	Tue, 9 Jul 2019 23:40:23 +0000 (01:40 +0200)
committer	Jiri Kosina <[email protected]>
	Tue, 9 Jul 2019 23:40:23 +0000 (01:40 +0200)
		1	2
drivers/hid/hid-ids.h	patch \|	diff1 \|	diff2 \|	blob \| history
drivers/hid/hid-uclogic-core.c	patch \|	diff1 \|	diff2 \|	blob \| history
drivers/hid/hid-uclogic-params.c	patch \|	diff1 \|	diff2 \|	blob \| history