diff options
| author | Al Viro | 2014-08-07 20:07:57 +0200 |
|---|---|---|
| committer | Al Viro | 2014-08-07 20:07:57 +0200 |
| commit | 82df9c8bebeff610705f30315f3903cbcb3aa58b (patch) | |
| tree | 0d54eac4e7b46876111256caf169b22627441453 /MAINTAINERS | |
| parent | Linux 3.16 (diff) | |
| parent | sched: Make task->start_time nanoseconds based (diff) | |
| download | kernel-qcow2-linux-82df9c8bebeff610705f30315f3903cbcb3aa58b.tar.gz kernel-qcow2-linux-82df9c8bebeff610705f30315f3903cbcb3aa58b.tar.xz kernel-qcow2-linux-82df9c8bebeff610705f30315f3903cbcb3aa58b.zip | |
Merge commit 'ccbf62d8a284cf181ac28c8e8407dd077d90dd4b' into for-next
backmerge to avoid kernel/acct.c conflict
Diffstat (limited to 'MAINTAINERS')
| -rw-r--r-- | MAINTAINERS | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index c2066f4c3286..117945edf26c 100644 --- 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> |