diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2018-02-22 17:44:19 +0100 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2018-02-22 17:44:19 +0100 |
| commit | ac07b9aa68170a1a99f0e5a4d8d30f83a75b5aa7 (patch) | |
| tree | 42e78020e60e62c80a292a31506f9763abff6e25 /MAINTAINERS | |
| parent | eec51afc9d2612c65523627cfd81456c6995a79a (diff) | |
| parent | 8aa36a8dcde3183d84db7b0d622ffddcebb61077 (diff) | |
| download | linux-ac07b9aa68170a1a99f0e5a4d8d30f83a75b5aa7.tar.bz2 | |
Merge tag 'mvebu-fixes-4.16-1' of git://git.infradead.org/linux-mvebu into fixes
Pull "mvebu fixes for 4.16 (part 1)" from Gregory CLEMENT:
- Updating my emails address (from free-electrons to bootlin)
- Adding back the selection of the PL310 Errata fix for the Cortex A9
based Armada SoCs (Armada 375 and 38x)
* tag 'mvebu-fixes-4.16-1' of git://git.infradead.org/linux-mvebu:
ARM: mvebu: Fix broken PL310_ERRATA_753970 selects
MAINTAINERS: update email address for Gregory CLEMENT
Diffstat (limited to 'MAINTAINERS')
| -rw-r--r-- | MAINTAINERS | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index 6dbcbc4913a4..f2e4d9d85ee4 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -1590,7 +1590,7 @@ ARM/Marvell Dove/MV78xx0/Orion SOC support M: Jason Cooper <jason@lakedaemon.net> M: Andrew Lunn <andrew@lunn.ch> M: Sebastian Hesselbarth <sebastian.hesselbarth@gmail.com> -M: Gregory Clement <gregory.clement@free-electrons.com> +M: Gregory Clement <gregory.clement@bootlin.com> L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers) S: Maintained F: Documentation/devicetree/bindings/soc/dove/ @@ -1604,7 +1604,7 @@ F: arch/arm/boot/dts/orion5x* ARM/Marvell Kirkwood and Armada 370, 375, 38x, 39x, XP, 3700, 7K/8K SOC support M: Jason Cooper <jason@lakedaemon.net> M: Andrew Lunn <andrew@lunn.ch> -M: Gregory Clement <gregory.clement@free-electrons.com> +M: Gregory Clement <gregory.clement@bootlin.com> M: Sebastian Hesselbarth <sebastian.hesselbarth@gmail.com> L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers) S: Maintained |