Merge commit 'ccbf62d8a284cf181ac28c8e8407dd077d90dd4b' into for-next

[karo-tx-linux.git] / MAINTAINERS

diff --git a/MAINTAINERS b/MAINTAINERS
index c2066f4c3286195b48aa57e23ff929a1f09aab0e..117945edf26c51bfd98478beaa5101e6e2be02e0 100644 (file)
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -4204,7 +4204,7 @@ L:        linux-kernel@vger.kernel.org
 T:     git git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git timers/core
 S:     Maintained
 F:     Documentation/timers/
-F:     kernel/hrtimer.c
+F:     kernel/time/hrtimer.c
 F:     kernel/time/clockevents.c
 F:     kernel/time/tick*.*
 F:     kernel/time/timer_*.c
@@ -7026,10 +7026,10 @@ POSIX CLOCKS and TIMERS
 M:     Thomas Gleixner <tglx@linutronix.de>
 L:     linux-kernel@vger.kernel.org
 T:     git git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git timers/core
-S:     Supported
+S:     Maintained
 F:     fs/timerfd.c
 F:     include/linux/timer*
-F:     kernel/*timer*
+F:     kernel/time/*timer*
 
 POWER SUPPLY CLASS/SUBSYSTEM and DRIVERS
 M:     Dmitry Eremin-Solenikov <dbaryshkov@gmail.com>