Merge branch 'timers-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...

[linux-2.6-block.git] / MAINTAINERS

diff --git a/MAINTAINERS b/MAINTAINERS
index 2b928aa857ce4939ba195503b73b47cc0a18dc4b..9a8e039362dc52b3b3a9baa10e8a4f79699f5c9b 100644 (file)
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -1180,7 +1180,7 @@ N:        owl
 F:     arch/arm/mach-actions/
 F:     arch/arm/boot/dts/owl-*
 F:     arch/arm64/boot/dts/actions/
-F:     drivers/clocksource/owl-*
+F:     drivers/clocksource/timer-owl*
 F:     drivers/pinctrl/actions/*
 F:     drivers/soc/actions/
 F:     include/dt-bindings/power/owl-*
@@ -1603,7 +1603,7 @@ L:        linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
 S:     Maintained
 F:     arch/arm/boot/dts/lpc43*
 F:     drivers/clk/nxp/clk-lpc18xx*
-F:     drivers/clocksource/time-lpc32xx.c
+F:     drivers/clocksource/timer-lpc32xx.c
 F:     drivers/i2c/busses/i2c-lpc2k.c
 F:     drivers/memory/pl172.c
 F:     drivers/mtd/spi-nor/nxp-spifi.c
@@ -2220,7 +2220,7 @@ F:        arch/arm/mach-vexpress/
 F:     */*/vexpress*
 F:     */*/*/vexpress*
 F:     drivers/clk/versatile/clk-vexpress-osc.c
-F:     drivers/clocksource/versatile.c
+F:     drivers/clocksource/timer-versatile.c
 N:     mps2
 
 ARM/VFP SUPPORT
@@ -2242,7 +2242,7 @@ M:        Tony Prisk <linux@prisktech.co.nz>
 L:     linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
 S:     Maintained
 F:     arch/arm/mach-vt8500/
-F:     drivers/clocksource/vt8500_timer.c
+F:     drivers/clocksource/timer-vt8500.c
 F:     drivers/i2c/busses/i2c-wmt.c
 F:     drivers/mmc/host/wmt-sdmmc.c
 F:     drivers/pwm/pwm-vt8500.c
@@ -2307,7 +2307,7 @@ F:        drivers/cpuidle/cpuidle-zynq.c
 F:     drivers/block/xsysace.c
 N:     zynq
 N:     xilinx
-F:     drivers/clocksource/cadence_ttc_timer.c
+F:     drivers/clocksource/timer-cadence-ttc.c
 F:     drivers/i2c/busses/i2c-cadence.c
 F:     drivers/mmc/host/sdhci-of-arasan.c
 F:     drivers/edac/synopsys_edac.c