Merge branch 'for-4.17/sony' into for-linus
authorJiri Kosina <jkosina@suse.cz>
Thu, 5 Apr 2018 11:28:34 +0000 (13:28 +0200)
committerJiri Kosina <jkosina@suse.cz>
Thu, 5 Apr 2018 11:28:34 +0000 (13:28 +0200)
commit108ff0e8012ae10708168940c7474318fb343751
tree57b8936d4ec961d62c90af3c2a4c764a1b2d50c0
parentaf73686e7bfe49fbbccc099995be8c78ce5bfe9a
parentb7289cb1cf99d432c894b9da7a54e24f73ae4c93
Merge branch 'for-4.17/sony' into for-linus

Pull support for NSG-MR5U and NSG-MR7U devices.
drivers/hid/hid-ids.h
drivers/hid/hid-quirks.c