]> git.baikalelectronics.ru Git - kernel.git/commit
Merge branches 'for-4.13/apple' and 'for-4.13/asus' into for-linus
authorJiri Kosina <jkosina@suse.cz>
Mon, 10 Jul 2017 08:56:59 +0000 (10:56 +0200)
committerJiri Kosina <jkosina@suse.cz>
Mon, 10 Jul 2017 09:08:37 +0000 (11:08 +0200)
commitc41a4eb1b3f4183834bcd8aa60288b6657c7dab4
tree8fa7a065b73acdc4c26fc133e2ac11051bae0d06
parent545815dc3a2de975e3548306b2ffefb8bf0817f6
parent71f9f58d86fcb4ccb75001a0aee7b762c52ab5d3
parent471fbcda569b929ba45592e5e55cdb9374331fce
Merge branches 'for-4.13/apple' and 'for-4.13/asus' into for-linus

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