Merge branch 'upstream-fixes' into for-linus

Conflicts:
	drivers/hid/hid-ids.h