| commit | 6ed7a70be54ef6148cbfce0d59d12d2aa41bbb23 | [log] [tgz] |
|---|---|---|
| author | Jiri Kosina <jkosina@suse.cz> | Wed Nov 15 11:10:38 2017 +0100 |
| committer | Jiri Kosina <jkosina@suse.cz> | Wed Nov 15 11:10:38 2017 +0100 |
| tree | 718281e0f03caaf45c3928fab322e60f7631a9bb | |
| parent | b50b9d3d21e0af1b8bda94d43c569593d45587af [diff] | |
| parent | 7da85fbf1c87d4f73621e0e7666a3387497075a9 [diff] |
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>