From: Jiri Kosina <jkosina@suse.cz>
Date: Wed, 15 Nov 2017 10:02:25 +0000 (+0100)
Subject: Merge branch 'for-4.14/upstream-fixes' into for-linus
X-Git-Tag: iommu-v4.15-rc3~41^2~9
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=83fd5ddc19931d5a5b884c43ee3c9d69c673bc96;p=users%2Fdwmw2%2Flinux.git

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

83fd5ddc19931d5a5b884c43ee3c9d69c673bc96