From: Ulf Hansson <ulf.hansson@linaro.org>
Date: Mon, 21 May 2018 13:49:25 +0000 (+0200)
Subject: Merge branch 'fixes' into next
X-Git-Tag: v4.18-rc1~137^2~15
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=8603f1e83897d3e4ed28c2c51ed6e8ef675908d9;p=users%2Fhch%2Fmisc.git

Merge branch 'fixes' into next
---

8603f1e83897d3e4ed28c2c51ed6e8ef675908d9