]> git.baikalelectronics.ru Git - kernel.git/commit
Merge branches 'for-4.13/ish' and 'for-4.13/ite' into for-linus
authorJiri Kosina <jkosina@suse.cz>
Mon, 10 Jul 2017 09:11:05 +0000 (11:11 +0200)
committerJiri Kosina <jkosina@suse.cz>
Mon, 10 Jul 2017 09:11:05 +0000 (11:11 +0200)
commit6393ed028b65f125f0e42cc5eac5c4f79d9d51e4
treee6c64576e933ca81540aff02909e500a713b59d3
parent345bb88556c99a01a3ca568446945d5d36bd9a1f
parent98af81e7b6e888347068f0f05ea62a127de22007
parentc057a43a5cab4fc2559ab30e978097aa870119c1
Merge branches 'for-4.13/ish' and 'for-4.13/ite' into for-linus

Conflicts:
drivers/hid/hid-core.c
drivers/hid/Kconfig
drivers/hid/hid-core.c
drivers/hid/hid-ids.h