Merge branch 'for-4.17/google-hammer' into for-linus
authorJiri Kosina <jkosina@suse.cz>
Thu, 5 Apr 2018 11:16:52 +0000 (13:16 +0200)
committerJiri Kosina <jkosina@suse.cz>
Thu, 5 Apr 2018 11:16:52 +0000 (13:16 +0200)
Support for Google Hammer device.

1  2 
drivers/hid/Kconfig
drivers/hid/hid-ids.h

Simple merge
Simple merge