tree fcd7f4118654286c1e634c87e4ad3efcea3c637d
parent 27fd38c5226ed0f1712d071880fa8e739eb78650
parent 282bf1fe6dca4b768d6bedc14aea1b82c36241c1
author Jiri Kosina <jkosina@suse.cz> 1463481682 +0200
committer Jiri Kosina <jkosina@suse.cz> 1463481682 +0200

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

Conflicts:
	drivers/hid/usbhid/hid-quirks.c