From: Michael Ellerman <mpe@ellerman.id.au>
Date: Wed, 20 Sep 2017 10:05:24 +0000 (+1000)
Subject: Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/scottwood/linux... 
X-Git-Tag: v5.15~10366^2~4
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=b134165eadd6dd07c49f8db40b218185ca3130b0;p=platform%2Fkernel%2Flinux-starfive.git

Merge branch 'next' of git://git./linux/kernel/git/scottwood/linux into fixes

Merge one commit from Scott which I missed while away.
---

b134165eadd6dd07c49f8db40b218185ca3130b0