Merge tag 'clk-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/clk/linux

[linux-2.6-microblaze.git] / MAINTAINERS

diff --git a/MAINTAINERS b/MAINTAINERS
index 249c309..62bb4c6 100644 (file)
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -1559,8 +1559,10 @@ M:       Manivannan Sadhasivam <manivannan.sadhasivam@linaro.org>
 L:     linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
 S:     Maintained
 F:     arch/arm64/boot/dts/bitmain/
+F:     drivers/clk/clk-bm1880.c
 F:     drivers/pinctrl/pinctrl-bm1880.c
 F:     Documentation/devicetree/bindings/arm/bitmain.yaml
+F:     Documentation/devicetree/bindings/clock/bitmain,bm1880-clk.yaml
 F:     Documentation/devicetree/bindings/pinctrl/bitmain,bm1880-pinctrl.txt
 
 ARM/CALXEDA HIGHBANK ARCHITECTURE
@@ -2519,10 +2521,10 @@ F:      drivers/reset/reset-uniphier.c
 F:     drivers/tty/serial/8250/8250_uniphier.c
 N:     uniphier
 
-ARM/Ux500 CLOCK FRAMEWORK SUPPORT
+Ux500 CLOCK DRIVERS
 M:     Ulf Hansson <ulf.hansson@linaro.org>
+L:     linux-clk@vger.kernel.org
 L:     linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
-T:     git git://git.linaro.org/people/ulfh/clk.git
 S:     Maintained
 F:     drivers/clk/ux500/