Merge branch 'for-4.15/upstream' into for-linus

Browse source

- 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>

...

This commit is contained in:

Jiri Kosina 2017-11-15 11:10:38 +01:00

parent b50b9d3d21 7da85fbf1c

commit 6ed7a70be5

7 changed files with 29 additions and 8 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download patch file Download diff file Expand all files Collapse all files

1

include/linux/hid.h

View file