git.cascardo.info Git - cascardo/linux.git/commit

projects / cascardo / linux.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: e82a82c f4c109b)

author	Jiri Kosina <jkosina@suse.cz>
	Thu, 28 Jul 2016 08:49:23 +0000 (10:49 +0200)
committer	Jiri Kosina <jkosina@suse.cz>
	Thu, 28 Jul 2016 08:49:23 +0000 (10:49 +0200)
commit	8c2f421c1f0fa7768767ecaad497aa676fc9015a
tree	c4e2ed4855fdc0dcbc038f6198f0330f3c9c3fdf	tree \| snapshot
parent	e82a82c19f4272ea5437cc76e5711b98e2ee6223	commit \| diff
parent	f4c109b660fa1d0453a6dde75bef725304687832	commit \| diff

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

Conflicts:
drivers/hid/hid-thingm.c

MAINTAINERS	diff1 \|	diff2 \|	blob \| history
drivers/hid/Kconfig	diff1 \|	diff2 \|	blob \| history
drivers/hid/Makefile	diff1 \|	diff2 \|	blob \| history
drivers/hid/hid-core.c	diff1 \|	diff2 \|	blob \| history
drivers/hid/hid-ids.h	diff1 \|	diff2 \|	blob \| history
drivers/usb/misc/Kconfig	diff1 \|	diff2 \|	blob \| history
drivers/usb/misc/Makefile	diff1 \|	diff2 \|	blob \| history

Unnamed repository; edit this file 'description' to name the repository.