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

Merge branch 'uhid' into for-linus 

Conflicts:
	drivers/hid/Kconfig
parents 929bd380 adefb69b
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