diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2014-07-21 15:14:52 +1000 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2014-07-21 15:14:52 +1000 |
| commit | a033607d7669a4ea96171dbb012456f394bb8c88 (patch) | |
| tree | 25a5e0042b225fb5ad1231d1e3ab2aec1f302307 /MAINTAINERS | |
| parent | d8f0a4ed3739df0075f5b0931ccf49d0955c70af (diff) | |
| parent | 09ea0f7492ff0d276a3dbd26f25ec37ec152ebc1 (diff) | |
Merge remote-tracking branch 'tip/auto-latest'
Diffstat (limited to 'MAINTAINERS')
| -rw-r--r-- | MAINTAINERS | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index 889033316517..cef2e1c8c4e1 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -4211,7 +4211,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 @@ -7024,10 +7024,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> |