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

Merge branches 'magicmouse', 'roccat' and 'vec-pedal' into for-linus 

Conflicts:
	drivers/hid/hid-ids.h
parents 35d03a0d 7d876c05 0b3fa399 70c7c9c4
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