projects / openwrt / staging / blogic.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: a0933a4 1477edb)
Merge branch 'for-4.14/upstream-fixes' into for-linus
authorJiri Kosina <jkosina@suse.cz>
Wed, 15 Nov 2017 10:02:25 +0000 (11:02 +0100)
committerJiri Kosina <jkosina@suse.cz>
Wed, 15 Nov 2017 10:02:25 +0000 (11:02 +0100)
commit83fd5ddc19931d5a5b884c43ee3c9d69c673bc96
tree5e728cf3d7c080b73eeea46e16faa520169f849dtree | snapshot
parenta0933a456ff83a3b5ffa3a1903e0b8de4a56adf5commit | diff
parent1477edb4853bd730e3ab37fa9165651c03c2cc05commit | 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>
John Crispins staging tree