Merge branch 'for-4.15/upstream' into for-linus
authorJiri Kosina <jkosina@suse.cz>
Wed, 15 Nov 2017 10:10:38 +0000 (11:10 +0100)
committerJiri Kosina <jkosina@suse.cz>
Wed, 15 Nov 2017 10:10:38 +0000 (11:10 +0100)
commit6ed7a70be54ef6148cbfce0d59d12d2aa41bbb23
tree718281e0f03caaf45c3928fab322e60f7631a9bb
parentb50b9d3d21e0af1b8bda94d43c569593d45587af
parent7da85fbf1c87d4f73621e0e7666a3387497075a9
Merge branch 'for-4.15/upstream' into for-linus

- cp2112: GPIO error handling and Kconfig fixes from S├ębastien Szymanski
- i2c-hid: fixup / quirk for Apollo-Lake based laptops, from Hans de Goede
- Input/Core: add eraser tool support, from Ping Cheng
- small assorted code fixes

Signed-off-by: Jiri Kosina <jkosina@suse.cz>
drivers/hid/Kconfig
drivers/hid/hid-core.c
drivers/hid/hid-ids.h
drivers/hid/i2c-hid/i2c-hid.c
include/linux/hid.h