git.kernelconcepts.de Git - karo-tx-linux.git/commit

author	Jiri Kosina <jkosina@suse.cz>
	Mon, 10 Jul 2017 09:11:25 +0000 (11:11 +0200)
committer	Jiri Kosina <jkosina@suse.cz>
	Mon, 10 Jul 2017 09:11:25 +0000 (11:11 +0200)
commit	837c194a4dfedd69ddbd5a586401380190776f48
tree	897ac0dce87f73491bba5a7098d2d7c34da1fc8b	tree \| snapshot
parent	604250ddcf874c4ee4137bf754f57fa903a3c1c1	commit \| diff
parent	9609827458c37d7b2c37f2a9255631c603a5004c	commit \| diff
parent	13b2e1ba486f07ccd26e01c563b52a9171b2c255	commit \| diff
parent	283a21da1239d8db7fdf6d9077feed73a6efffa2	commit \| diff
parent	08585e43d22802666a466af1ca5795085e74d60d	commit \| diff
parent	75a5f3ac5c861e969e2379816709d55f1cb5e9f4	commit \| diff

Merge branches 'for-4.13/multitouch', 'for-4.13/retrode', 'for-4.13/transport-open-close-consolidation', 'for-4.13/upstream' and 'for-4.13/wacom' into for-linus

drivers/hid/Kconfig	diff1 \|	diff2 \|	diff3 \|	diff4 \|	diff5 \|	diff6 \|	blob \| history
drivers/hid/Makefile	diff1 \|	diff2 \|	diff3 \|	diff4 \|	diff5 \|	diff6 \|	blob \| history
drivers/hid/hid-core.c	diff1 \|	diff2 \|	diff3 \|	diff4 \|	diff5 \|	diff6 \|	blob \| history
drivers/hid/hid-ids.h	diff1 \|	diff2 \|	diff3 \|	diff4 \|	diff5 \|	diff6 \|	blob \| history
drivers/hid/i2c-hid/i2c-hid.c	diff1 \|	diff2 \|	diff3 \|	diff4 \|	diff5 \|	diff6 \|	blob \| history
drivers/hid/wacom_wac.c	diff1 \|	diff2 \|	diff3 \|	diff4 \|	diff5 \|	diff6 \|	blob \| history
include/linux/hid.h	diff1 \|	diff2 \|	diff3 \|	diff4 \|	diff5 \|	diff6 \|	blob \| history