Merge branch 'for-4.8/hid-led' into for-linus
authorJiri Kosina <jkosina@suse.cz>
Thu, 28 Jul 2016 08:49:23 +0000 (10:49 +0200)
committerJiri Kosina <jkosina@suse.cz>
Thu, 28 Jul 2016 08:49:23 +0000 (10:49 +0200)
Conflicts:
drivers/hid/hid-thingm.c

1  2 
MAINTAINERS
drivers/hid/Kconfig
drivers/hid/Makefile
drivers/hid/hid-core.c
drivers/hid/hid-ids.h
drivers/usb/misc/Kconfig
drivers/usb/misc/Makefile

diff --cc MAINTAINERS
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge