From: Dmitry Torokhov <dmitry.torokhov@gmail.com>
Date: Thu, 1 Feb 2018 08:41:33 +0000 (-0800)
Subject: Merge tag 'v4.15' into next
X-Git-Tag: v4.17-rc1~116^2^2~18
X-Git-Url: https://repo.jachan.dev/linux.git/commitdiff_plain/10a558374f3751cf4eb55143008975641dfc2cf4

Merge tag 'v4.15' into next

Sync with mainline to get in trackpoint updates and other changes.
---

10a558374f3751cf4eb55143008975641dfc2cf4