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)
commite1842c6947b5609b1a301e482ddb43abe4dcf0d4
tree2aaf04cc5c5f529c69ab29e3d3e4558a3968baea
parent05d83cc1629ca60251e6443047f3ff1929d03b4c
parent90d265ae30f1cfb765deadafebb1014edafb2261
Merge branch 'for-4.17/google-hammer' into for-linus

Support for Google Hammer device.
drivers/hid/Kconfig
drivers/hid/hid-ids.h