diff options
| author | Thomas Gleixner <tglx@linutronix.de> | 2015-12-19 12:03:17 +0100 |
|---|---|---|
| committer | Thomas Gleixner <tglx@linutronix.de> | 2015-12-19 12:03:17 +0100 |
| commit | e2666d69068aba300d6c0dfe96489552f653be2a (patch) | |
| tree | 07fa371d800deec45225589ebe6154dcc6c956b2 /MAINTAINERS | |
| parent | d33f250af4e67d449f2c748b861ba99d50955469 (diff) | |
| parent | ec02b076ceab63f99e5b3d80fd223d777266c236 (diff) | |
| download | linux-e2666d69068aba300d6c0dfe96489552f653be2a.tar.gz linux-e2666d69068aba300d6c0dfe96489552f653be2a.tar.bz2 linux-e2666d69068aba300d6c0dfe96489552f653be2a.zip | |
Merge branch 'fortglx/4.5/time' of https://git.linaro.org/people/john.stultz/linux into timers/core
Get the core time(keeping) updates from John Stultz
- NTP robustness tweaks
- Another signed overflow nailed down
- More y2038 changes
- Stop alarmtimer after resume
- MAINTAINERS update
- Selftest fixes
Diffstat (limited to 'MAINTAINERS')
| -rw-r--r-- | MAINTAINERS | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index 050d0e77a2cf..b2f6b0463678 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -9348,7 +9348,7 @@ M: Andreas Noever <andreas.noever@gmail.com> S: Maintained F: drivers/thunderbolt/ -TIMEKEEPING, CLOCKSOURCE CORE, NTP +TIMEKEEPING, CLOCKSOURCE CORE, NTP, ALARMTIMER M: John Stultz <john.stultz@linaro.org> M: Thomas Gleixner <tglx@linutronix.de> L: linux-kernel@vger.kernel.org @@ -9361,6 +9361,7 @@ F: include/uapi/linux/time.h F: include/uapi/linux/timex.h F: kernel/time/clocksource.c F: kernel/time/time*.c +F: kernel/time/alarmtimer.c F: kernel/time/ntp.c F: tools/testing/selftests/timers/ |