diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2018-10-01 16:02:56 +0200 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2018-10-02 12:05:18 +0200 |
| commit | 7ab78d02cae7963da9abefa15464b53adf04bc64 (patch) | |
| tree | 4a6c0c2becf67cf12b6f256392ed250d809a82a3 /MAINTAINERS | |
| parent | 1c15f655d160cce3779a4c7a5862407a90e0313f (diff) | |
| parent | 40ad192f9e88d1376320399e49b9d978b56a9477 (diff) | |
| download | blackbird-obmc-linux-7ab78d02cae7963da9abefa15464b53adf04bc64.tar.gz blackbird-obmc-linux-7ab78d02cae7963da9abefa15464b53adf04bc64.zip | |
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>
Diffstat (limited to 'MAINTAINERS')
| -rw-r--r-- | MAINTAINERS | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index 2efd6c87005e..2ae55e7f6b2a 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -8745,7 +8745,7 @@ S: Maintained F: drivers/net/phy/marvell10g.c MARVELL MVNETA ETHERNET DRIVER -M: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> +M: Thomas Petazzoni <thomas.petazzoni@bootlin.com> L: netdev@vger.kernel.org S: Maintained F: drivers/net/ethernet/marvell/mvneta.* @@ -11081,7 +11081,7 @@ S: Maintained F: drivers/firmware/pcdp.* PCI DRIVER FOR AARDVARK (Marvell Armada 3700) -M: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> +M: Thomas Petazzoni <thomas.petazzoni@bootlin.com> L: linux-pci@vger.kernel.org L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers) S: Maintained @@ -11113,7 +11113,7 @@ F: Documentation/devicetree/bindings/pci/versatile.txt F: drivers/pci/controller/pci-versatile.c PCI DRIVER FOR ARMADA 8K -M: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> +M: Thomas Petazzoni <thomas.petazzoni@bootlin.com> L: linux-pci@vger.kernel.org L: linux-arm-kernel@lists.infradead.org S: Maintained @@ -11175,7 +11175,7 @@ F: include/linux/switchtec.h F: drivers/ntb/hw/mscc/ PCI DRIVER FOR MVEBU (Marvell Armada 370 and Armada XP SOC support) -M: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> +M: Thomas Petazzoni <thomas.petazzoni@bootlin.com> M: Jason Cooper <jason@lakedaemon.net> L: linux-pci@vger.kernel.org L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers) |
