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

Merge branch 'for-4.8/hid-led' into for-linus 

Conflicts:
	drivers/hid/hid-thingm.c
parents e82a82c1 f4c109b6
Hide whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment