]> 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)
commit182f4548f887940d37ca98675251fe2b26e262a0
treee6c64576e933ca81540aff02909e500a713b59d3
parentc41a4eb1b3f4183834bcd8aa60288b6657c7dab4
parentedb23ee5d9f65b2d850ea5d416a88d657a97bb6f
parentb474cc1c4bd2c9501762e15028f11c9b456ab222
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