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

Merge branch 'upstream' into for-linus 

Conflicts:
	drivers/hid/hid-core.c
parents b3d07e03 d1257081
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