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

Merge branch 'for-4.7/upstream' into for-linus 

Conflicts:
	drivers/hid/usbhid/hid-quirks.c
parents 27fd38c5 282bf1fe
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