From: Jiri Kosina <jkosina@suse.cz>
Date: Tue, 5 Sep 2017 09:03:59 +0000 (+0200)
Subject: Merge branch 'for-4.13/upstream-fixes' into for-linus
X-Git-Tag: microblaze-4.14-rc3~143^2~8
X-Git-Url: http://git.monstr.eu/?a=commitdiff_plain;h=d487bb6ef121357bd4cd42fe2b08a6857ed26525;p=linux-2.6-microblaze.git

Merge branch 'for-4.13/upstream-fixes' into for-linus

- WACOM_HID_WD_TOUCHRINGSTATUS usage mapping fix in Wacom driver
  from Jason Gerecke
- new Logitech device ID quirk from Kyle Roarty
---

d487bb6ef121357bd4cd42fe2b08a6857ed26525