tree c4e2ed4855fdc0dcbc038f6198f0330f3c9c3fdf
parent e82a82c19f4272ea5437cc76e5711b98e2ee6223
parent f4c109b660fa1d0453a6dde75bef725304687832
author Jiri Kosina <jkosina@suse.cz> 1469695763 +0200
committer Jiri Kosina <jkosina@suse.cz> 1469695763 +0200

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

Conflicts:
	drivers/hid/hid-thingm.c