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

Merge branches 'ntrig', 'picolcd', 'prodikeys' and 'roccat-kone' into for-linus 

Conflicts:
	drivers/hid/Makefile
parents 77933c35 ab3f4980 aeacb6fd 95736de9 1f749d8d
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