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

Merge branch 'upstream-fixes' into for-next 

Conflicts:

	drivers/hid/hid-ids.h
parents 1db489b2 4dfdc464
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