Skip to content
Snippets Groups Projects
Commit e1a0bdd8 authored by Jiri Kosina's avatar Jiri Kosina
Browse files

Merge branch 'master' into upstream 

Conflicts:
	drivers/hid/hid-ids.h
parents 8127f4e8 1a45dcfe
No related branches found
No related tags found
No related merge requests found
Expand all Hide whitespace changes
Inline Side-by-side
Showing
with 706 additions and 928 deletions
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