Merge 7e2cd21e02b3 ("Merge tag 'tty-6.0-rc7' of git://git.kernel.org/pub/scm/linux...

[platform/kernel/linux-starfive.git] / MAINTAINERS

diff --git a/MAINTAINERS b/MAINTAINERS
index bf6650f..d29fce0 100644 (file)
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -5246,6 +5246,7 @@ F:        block/blk-throttle.c
 F:     include/linux/blk-cgroup.h
 
 CONTROL GROUP - CPUSET
+M:     Waiman Long <longman@redhat.com>
 M:     Zefan Li <lizefan.x@bytedance.com>
 L:     cgroups@vger.kernel.org
 S:     Maintained
@@ -13293,7 +13294,7 @@ F:      include/dt-bindings/dma/at91.h
 MICROCHIP AT91 SERIAL DRIVER
 M:     Richard Genoud <richard.genoud@gmail.com>
 S:     Maintained
-F:     Documentation/devicetree/bindings/mfd/atmel-usart.txt
+F:     Documentation/devicetree/bindings/serial/atmel,at91-usart.yaml
 F:     drivers/tty/serial/atmel_serial.c
 F:     drivers/tty/serial/atmel_serial.h
 
@@ -13301,7 +13302,7 @@ MICROCHIP AT91 USART MFD DRIVER
 M:     Radu Pirea <radu_nicolae.pirea@upb.ro>
 L:     linux-kernel@vger.kernel.org
 S:     Supported
-F:     Documentation/devicetree/bindings/mfd/atmel-usart.txt
+F:     Documentation/devicetree/bindings/serial/atmel,at91-usart.yaml
 F:     drivers/mfd/at91-usart.c
 F:     include/dt-bindings/mfd/at91-usart.h
 
@@ -13309,7 +13310,7 @@ MICROCHIP AT91 USART SPI DRIVER
 M:     Radu Pirea <radu_nicolae.pirea@upb.ro>
 L:     linux-spi@vger.kernel.org
 S:     Supported
-F:     Documentation/devicetree/bindings/mfd/atmel-usart.txt
+F:     Documentation/devicetree/bindings/serial/atmel,at91-usart.yaml
 F:     drivers/spi/spi-at91-usart.c
 
 MICROCHIP AUDIO ASOC DRIVERS