Merge branches 'for-4.6/upstream-fixes', 'for-4.7/asus', 'for-4.7/hidraw' and 'for...
authorJiri Kosina <jkosina@suse.cz>
Tue, 17 May 2016 10:38:03 +0000 (12:38 +0200)
committerJiri Kosina <jkosina@suse.cz>
Tue, 17 May 2016 10:38:03 +0000 (12:38 +0200)
commit27fd38c5226ed0f1712d071880fa8e739eb78650
tree1e3b5714cb7828efc2b97375de1edc6006ee1af6
parenteff6ca97998386447b795362cc20213114af2870
parentb94f7d5ddf1b114e66d9bcc07d0ead080470383b
parent8f507c8b0fa5d679e2957aad0e5ecd47675fca9a
parentbbf4ac9cfa9b681e3b657699f39fc855408904b8
Merge branches 'for-4.6/upstream-fixes', 'for-4.7/asus', 'for-4.7/hidraw' and 'for-4.7/thingm' into for-linus
drivers/hid/hid-core.c
drivers/hid/hid-ids.h