From: Arnd Bergmann <arnd@arndb.de>
Date: Mon, 1 Oct 2018 14:02:56 +0000 (+0200)
Subject: Merge tag 'mvebu-soc-4.20-1' of git://git.infradead.org/linux-mvebu into next/soc
X-Git-Tag: v5.15~7690^2~5
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=7ab78d02cae7963da9abefa15464b53adf04bc64;p=platform%2Fkernel%2Flinux-starfive.git

Merge tag 'mvebu-soc-4.20-1' of git://git.infradead.org/linux-mvebu into next/soc

mvebu soc for 4.20 (part 1)

 - use dt_fixup to provide fallback for enable-method for Armada XP
 - document the marvell,prestera compatible string
 - update Thomas Petazzoni email in MAINTAINERS file

* tag 'mvebu-soc-4.20-1' of git://git.infradead.org/linux-mvebu:
  dt-bindings: marvell,prestera: Add common compatible string
  MAINTAINERS: replace free-electrons.com by bootlin.com for Thomas Petazzoni
  ARM: mvebu: use dt_fixup to provide fallback for enable-method

Signed-off-by: Arnd Bergmann <arnd@arndb.de>
---

7ab78d02cae7963da9abefa15464b53adf04bc64