]> git.baikalelectronics.ru Git - kernel.git/commit
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)
commitd780804e071e0b48d2519ef5f9f47424c0ed2f4d
tree718281e0f03caaf45c3928fab322e60f7631a9bb
parentb861a859f51e41d155ac7fb96e7136dc95683fa4
parent8a98fd2dc9f8b4fa3189cf472d1d6f1aee6179cd
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