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

Merge branches 'for-4.13/ish' and 'for-4.13/ite' into for-linus 

Conflicts:
	drivers/hid/hid-core.c
parents 4f94ff4e 16941309 6e7edabf
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