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)
commit4f94ff4e9c52b40250b8f5a54c9f99101de31e9d
tree8fa7a065b73acdc4c26fc133e2ac11051bae0d06
parent900a88ef348803cd2ad2aeb13ffe06e807c6ce65
parentbd77a0f08ec57f7b805dfbaa64b36329dfa005d6
parent38b2d78c557ebb47e65de5ff1415144c65c4cf7c
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