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

Merge branch 'upstream' into for-linus 

Conflicts:
	drivers/hid/Makefile
parents 77aa8e65 4d5df5d1
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