]> git.baikalelectronics.ru Git - kernel.git/commit
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)
commit37c6d889403ebcad6311fec3cbb8234ec8df1bcb
tree5e728cf3d7c080b73eeea46e16faa520169f849d
parentde4ab01d3927cc057ba603db53ecd55be8a9fe79
parentc3d73c53c14fda1e6545f50eac0177fb2cfaa68a
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>