Merge branch 'for-4.8/hid-led' into for-linus

Conflicts:
	drivers/hid/hid-thingm.c