From: Jiri Kosina <jkosina@suse.cz>
Date: Thu, 28 Jul 2016 08:49:23 +0000 (+0200)
Subject: Merge branch 'for-4.8/hid-led' into for-linus
X-Git-Tag: v4.8-rc1~121^2
X-Git-Url: http://git.cascardo.info/?p=cascardo%2Flinux.git;a=commitdiff_plain;h=8c2f421c1f0fa7768767ecaad497aa676fc9015a

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

Conflicts:
	drivers/hid/hid-thingm.c
---

8c2f421c1f0fa7768767ecaad497aa676fc9015a