diff options
| author | Ingo Molnar <mingo@kernel.org> | 2014-07-16 21:11:17 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2014-07-16 21:11:17 +0200 |
| commit | 061f39b71aaf454a26ebcf56bfa9e88380e3e111 (patch) | |
| tree | 5629512093719d37776931a799b2cb84bc2aef7b /MAINTAINERS | |
| parent | 717a98c5bd1fb3b4d2e53bd588db5f63cf6fc7b4 (diff) | |
| parent | be11e6d86081aa6328eaa4fe6dd14ccf39a023c8 (diff) | |
Merge branch 'timers/core'
Diffstat (limited to 'MAINTAINERS')
| -rw-r--r-- | MAINTAINERS | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index e31c87474739..1d287ae529a1 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -4205,7 +4205,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 @@ -7022,10 +7022,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> |