From: Sebastian Reichel <sebastian.reichel@collabora.co.uk>
Date: Mon, 12 Mar 2018 13:35:10 +0000 (+0100)
Subject: Merge branch 'fixes' into for-next
X-Git-Tag: v4.17-rc1~155^2~4
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=75dd56c0cd68847809e6e75d6fcc234e6e6711d5;p=users%2Fjedix%2Flinux-maple.git

Merge branch 'fixes' into for-next

Merge for-stable fixes branch into for-next development branch.

Signed-off-by: Sebastian Reichel <sebastian.reichel@collabora.co.uk>
---

75dd56c0cd68847809e6e75d6fcc234e6e6711d5