From: Dmitry Torokhov <dmitry.torokhov@gmail.com>
Date: Tue, 19 Jul 2016 18:02:56 +0000 (-0700)
Subject: Merge branch 'for-linus' into next
X-Git-Tag: Ubuntu-5.0.0-8.9~6803^2^2~7
X-Git-Url: https://git.proxmox.com/?a=commitdiff_plain;h=8c57a5e7b2820f349c95b8c8393fec1e0f4070d2;p=mirror_ubuntu-disco-kernel.git

Merge branch 'for-linus' into next

Sync up to bring in wacom_w8001 changes to avoid merge conflicts later.
---

8c57a5e7b2820f349c95b8c8393fec1e0f4070d2