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/[email protected]
Signed-off-by: Arnd Bergmann <[email protected]>

3 files changed, 9 insertions, 2 deletions

diff --git a/CREDITS b/CREDITS
index b97256d5bc24..7e85a53b6a88 100644
--- a/CREDITS
+++ b/CREDITS
@@ -895,6 +895,12 @@ S: 3000 FORE Drive
 S: Warrendale, Pennsylvania 15086
 S: USA
 
+N: Ludovic Desroches
+E: [email protected]
+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: [email protected]
 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 <[email protected]>
-  - Ludovic Desroches <[email protected]>
+  - Claudiu Beznea <[email protected]>
+  - Nicolas Ferre <[email protected]>
 
 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 <[email protected]>
 M:	Alexandre Belloni <[email protected]>
-M:	Ludovic Desroches <[email protected]>
+M:	Claudiu Beznea <[email protected]>
 L:	[email protected] (moderated for non-subscribers)
 S:	Supported
 W:	http://www.linux4sam.org