git.samba.org / sfrench / cifs-2.6.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | compact (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)
- 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>

Trivial merge
Unnamed repository; edit this file 'description' to name the repository.