Merge branch 'upstream' into for-linus

drivers/hid/Kconfig

drivers/hid/Makefile

drivers/hid/hid-apple.c

drivers/hid/hid-aureal.c

drivers/hid/hid-core.c

drivers/hid/hid-ids.h

drivers/hid/hid-uclogic.c

drivers/hid/hidraw.c

drivers/hid/usbhid/hid-core.c

drivers/hid/usbhid/hiddev.c

drivers/hid/usbhid/usbhid.h

include/linux/hid.h

include/linux/hidraw.h