Merge branch 'upstream' into for-linus

Conflicts:
	drivers/hid/hid-wacom.c