Skip to content

Commit

Permalink
Merge tag 'at91-fixes-5.17' of git://git.kernel.org/pub/scm/linux/ker…
Browse files Browse the repository at this point in the history
…nel/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>
  • Loading branch information
Arnd Bergmann committed Feb 11, 2022
2 parents 5e5eddd + 2607796 commit a8cd285
Show file tree
Hide file tree
Showing 3 changed files with 9 additions and 2 deletions.
6 changes: 6 additions & 0 deletions CREDITS
Original file line number Diff line number Diff line change
Expand Up @@ -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/
Expand Down
3 changes: 2 additions & 1 deletion Documentation/devicetree/bindings/arm/atmel-at91.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion MAINTAINERS
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit a8cd285

Please sign in to comment.