diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2022-02-12 00:13:16 +0300 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2022-02-12 00:13:18 +0300 |
| commit | a8cd28553f0f7979668473b0b4675e5dd7587a48 (patch) | |
| tree | 0503543b025df640a6da59a3025ee511b096563f | |
| parent | 5e5eddd94c8906472e3904cb11b4e3ccbb99d0d4 (diff) | |
| parent | 26077968f8389a68fdb38af3f2c2289ddc95e8ca (diff) | |
Merge tag 'at91-fixes-5.17' of git://git.kernel.org/pub/scm/linux/kernel/git/at91/linux into arm/fixes
AT91 fixes #1 for 5.17:
- MAINTAINERS file update.
* tag 'at91-fixes-5.17' of git://git.kernel.org/pub/scm/linux/kernel/git/at91/linux:
dt-bindings: ARM: at91: update maintainers entry
MAINTAINERS: replace a Microchip AT91 maintainer
Link: https://lore.kernel.org/r/20220211133515.15314-1-nicolas.ferre@microchip.com
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
| -rw-r--r-- | CREDITS | 6 | ||||
| -rw-r--r-- | Documentation/devicetree/bindings/arm/atmel-at91.yaml | 3 | ||||
| -rw-r--r-- | MAINTAINERS | 2 |
3 files changed, 9 insertions, 2 deletions
@@ -895,6 +895,12 @@ S: 3000 FORE Drive S: Warrendale, Pennsylvania 15086 S: USA +N: Ludovic Desroches +E: ludovic.desroches@microchip.com +D: Maintainer for ARM/Microchip (AT91) SoC support +D: Author of ADC, pinctrl, XDMA and SDHCI drivers for this platform +S: France + N: Martin Devera E: devik@cdi.cz W: http://luxik.cdi.cz/~devik/qos/ diff --git a/Documentation/devicetree/bindings/arm/atmel-at91.yaml b/Documentation/devicetree/bindings/arm/atmel-at91.yaml index c612e1f48dba..ff91df04f9f4 100644 --- a/Documentation/devicetree/bindings/arm/atmel-at91.yaml +++ b/Documentation/devicetree/bindings/arm/atmel-at91.yaml @@ -8,7 +8,8 @@ title: Atmel AT91 device tree bindings. maintainers: - Alexandre Belloni <alexandre.belloni@bootlin.com> - - Ludovic Desroches <ludovic.desroches@microchip.com> + - Claudiu Beznea <claudiu.beznea@microchip.com> + - Nicolas Ferre <nicolas.ferre@microchip.com> description: | Boards with a SoC of the Atmel AT91 or SMART family shall have the following diff --git a/MAINTAINERS b/MAINTAINERS index f3b825c779a5..dcf311d675f3 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -2254,7 +2254,7 @@ F: drivers/phy/mediatek/ ARM/Microchip (AT91) SoC support M: Nicolas Ferre <nicolas.ferre@microchip.com> M: Alexandre Belloni <alexandre.belloni@bootlin.com> -M: Ludovic Desroches <ludovic.desroches@microchip.com> +M: Claudiu Beznea <claudiu.beznea@microchip.com> L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers) S: Supported W: http://www.linux4sam.org |