| commit | 83fd5ddc19931d5a5b884c43ee3c9d69c673bc96 | [log] [tgz] |
|---|---|---|
| author | Jiri Kosina <jkosina@suse.cz> | Wed Nov 15 11:02:25 2017 +0100 |
| committer | Jiri Kosina <jkosina@suse.cz> | Wed Nov 15 11:02:25 2017 +0100 |
| tree | 5e728cf3d7c080b73eeea46e16faa520169f849d | |
| parent | a0933a456ff83a3b5ffa3a1903e0b8de4a56adf5 [diff] | |
| parent | 1477edb4853bd730e3ab37fa9165651c03c2cc05 [diff] |
Merge branch 'for-4.14/upstream-fixes' into for-linus - Wacom: recognize PEN application collection properly, from Jason Gerecke - RMI: avoid cofusion caused by RMI functions being by mistake called on non-RMI devices, from Andrew Duggan - small device-ID-specific quirks/fixes Signed-off-by: Jiri Kosina <jkosina@suse.cz>