Skip to content
Commit 8b66a16f authored by Jiri Kosina's avatar Jiri Kosina
Browse files

Merge branch 'uc-logic' into for-linus 

Conflicts:
	drivers/hid/hid-ids.h
	drivers/hid/hid-lg.c
	drivers/hid/usbhid/hid-quirks.c
parents bbd128b5 41fa9230
Show whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment