summaryrefslogtreecommitdiff
path: root/drivers/hid
diff options
context:
space:
mode:
authorJiri Kosina <jkosina@suse.cz>2017-07-10 10:56:59 +0200
committerJiri Kosina <jkosina@suse.cz>2017-07-10 11:08:37 +0200
commit4f94ff4e9c52b40250b8f5a54c9f99101de31e9d (patch)
tree8fa7a065b73acdc4c26fc133e2ac11051bae0d06 /drivers/hid
parent900a88ef348803cd2ad2aeb13ffe06e807c6ce65 (diff)
parentbd77a0f08ec57f7b805dfbaa64b36329dfa005d6 (diff)
parent38b2d78c557ebb47e65de5ff1415144c65c4cf7c (diff)
Merge branches 'for-4.13/apple' and 'for-4.13/asus' into for-linus
Conflicts: drivers/hid/hid-core.c