Merge tag 'clk-for-linus-3.14-part1' of git://git.linaro.org/people/mike.turquette...

[linux-2.6-block.git] / MAINTAINERS

diff --git a/MAINTAINERS b/MAINTAINERS
index 64a783fb793193a319d10dddb0ebb1a151e8afa1..15802a32469efbd1d71fbff46a8e88b5af765c31 100644 (file)
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -1345,6 +1345,14 @@ F:       drivers/rtc/rtc-ab8500.c
 F:     drivers/rtc/rtc-pl031.c
 T:     git git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-stericsson.git
 
+ARM/Ux500 CLOCK FRAMEWORK SUPPORT
+M:     Ulf Hansson <ulf.hansson@linaro.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/
+F:     include/linux/platform_data/clk-ux500.h
+
 ARM/VFP SUPPORT
 M:     Russell King <linux@arm.linux.org.uk>
 L:     linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
@@ -7431,6 +7439,12 @@ L:       linux-media@vger.kernel.org
 S:     Supported
 F:     drivers/media/i2c/s5c73m3/*
 
+SAMSUNG SOC CLOCK DRIVERS
+M:     Tomasz Figa <t.figa@samsung.com>
+S:     Supported
+L:     linux-samsung-soc@vger.kernel.org (moderated for non-subscribers)
+F:     drivers/clk/samsung/
+
 SERIAL DRIVERS
 M:     Greg Kroah-Hartman <gregkh@linuxfoundation.org>
 L:     linux-serial@vger.kernel.org