From: Olof Johansson <olof@lixom.net>
Date: Fri, 25 May 2018 21:03:53 +0000 (-0700)
Subject: Merge tag 'sunxi-fixes-for-4.17' of https://git.kernel.org/pub/scm/linux/kernel/git... 
X-Git-Tag: v5.15~8797^2~3
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=f2c56aac9573c1bcb54d5c06f4a0d0f23532aad1;p=platform%2Fkernel%2Flinux-starfive.git

Merge tag 'sunxi-fixes-for-4.17' of https://git./linux/kernel/git/sunxi/linux into fixes

Allwinner fixes for 4.17

Here is a bunch of fixes for merge issues, typos and wrong clocks being
described for simplefb, resulting in non-working displays.

* tag 'sunxi-fixes-for-4.17' of https://git.kernel.org/pub/scm/linux/kernel/git/sunxi/linux:
  ARM: sun8i: v3s: fix spelling mistake: "disbaled" -> "disabled"
  ARM: dts: sun4i: Fix incorrect clocks for displays
  ARM: dts: sun8i: h3: Re-enable EMAC on Orange Pi One

Signed-off-by: Olof Johansson <olof@lixom.net>
---

f2c56aac9573c1bcb54d5c06f4a0d0f23532aad1