diff options
author | Jiri Kosina <jkosina@suse.cz> | 2017-05-02 11:02:24 +0200 |
---|---|---|
committer | Jiri Kosina <jkosina@suse.cz> | 2017-05-02 11:02:24 +0200 |
commit | 800f3eef8ebc1264e9c135bfa892c8ae41fa4792 (patch) | |
tree | cb4aa7a8a0780283b02a7c511ff41ba345cd314f /drivers/hid/hid-ids.h | |
parent | Merge branches 'for-4.11/upstream-fixes', 'for-4.12/accutouch', 'for-4.12/cp2112', 'for-4.12/hid-core-null-state-handling', 'for-4.12/hiddev', 'for-4.12/i2c-hid', 'for-4.12/innomedia', 'for-4.12/logitech-hidpp-battery-power-supply', 'for-4.12/multitouch', 'for-4.12/nti', 'for-4.12/upstream' and '... (diff) | |
parent | HID: sony: remove redundant check for -ve err (diff) | |
download | linux-dev-800f3eef8ebc1264e9c135bfa892c8ae41fa4792.tar.xz linux-dev-800f3eef8ebc1264e9c135bfa892c8ae41fa4792.zip |
Merge branch 'for-4.12/sony' into for-linus
Diffstat (limited to 'drivers/hid/hid-ids.h')
0 files changed, 0 insertions, 0 deletions