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

Merge branch 'upstream' into for-linus 

Conflicts:
	drivers/hid/hid-core.c
	drivers/hid/hid-ids.h
parents f6f12427 1bcc2067
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