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

Merge branches 'upstream-fixes', 'wacom' and 'waltop' into for-linus 

Conflicts:
	drivers/hid/hid-core.c
parents 56ccd186 44d27f7d 4e52b538 ed137949
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