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

Merge branch 'for-4.3/microsoft' into for-linus 

Conflicts:
	drivers/hid/usbhid/hid-quirks.c
parents 8c4de9bc 0439de75
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