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)
commitd463fd44c4d620b6f96f9f56474fbd42cb663a84
tree2aaf04cc5c5f529c69ab29e3d3e4558a3968baea
parenta9ef00aec7633b3be3b19a7fce9a8d13f5a07c1c
parent7d3d88401fb75081e731d62c1c79584413525aa6
Merge branch 'for-4.17/google-hammer' into for-linus

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