Merge branch 'upstream' into for-linus

drivers/hid/Kconfig

drivers/hid/Makefile

drivers/hid/hid-chicony.c

drivers/hid/hid-core.c

drivers/hid/hid-ids.h

drivers/hid/hid-kye.c

drivers/hid/hid-magicmouse.c

drivers/hid/hid-multitouch.c

drivers/hid/hid-saitek.c

drivers/hid/hid-sjoy.c

drivers/hid/hid-tivo.c

drivers/hid/hid-uclogic.c

drivers/hid/hid-wacom.c

drivers/hid/hid-waltop.c

drivers/hid/usbhid/hid-quirks.c