From: Jiri Kosina Date: Wed, 15 Nov 2017 10:10:38 +0000 (+0100) Subject: Merge branch 'for-4.15/upstream' into for-linus X-Git-Tag: v4.15-rc1~114^2~2 X-Git-Url: https://repo.jachan.dev/linux.git/commitdiff_plain/6ed7a70be54ef6148cbfce0d59d12d2aa41bbb23 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 --- 6ed7a70be54ef6148cbfce0d59d12d2aa41bbb23