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)
Pull support for NSG-MR5U and NSG-MR7U devices.

1  2 
drivers/hid/hid-ids.h
drivers/hid/hid-quirks.c

Simple merge
Simple merge