Merge branch 'for-4.7/upstream' into for-linus
authorJiri Kosina <jkosina@suse.cz>
Tue, 17 May 2016 10:41:22 +0000 (12:41 +0200)
committerJiri Kosina <jkosina@suse.cz>
Tue, 17 May 2016 10:41:22 +0000 (12:41 +0200)
commit3390e579b3dac71e630ed879a73c5ac3b4447045
treefcd7f4118654286c1e634c87e4ad3efcea3c637d
parent27fd38c5226ed0f1712d071880fa8e739eb78650
parent282bf1fe6dca4b768d6bedc14aea1b82c36241c1
Merge branch 'for-4.7/upstream' into for-linus

Conflicts:
drivers/hid/usbhid/hid-quirks.c
drivers/hid/hid-core.c
drivers/hid/hid-ids.h
drivers/hid/hidraw.c
drivers/hid/usbhid/hid-quirks.c