Merge branches 'upstream' and 'upstream-fixes' into for-linus

diff --cc drivers/hid/hid-core.c
Simple merge

diff --cc drivers/hid/hid-debug.c
Simple merge

diff --cc drivers/hid/hid-ids.h
Simple merge

diff --cc drivers/hid/hidraw.c
Simple merge

diff --cc drivers/hid/usbhid/hid-quirks.c
Simple merge

diff --cc drivers/hid/usbhid/hiddev.c
Simple merge