diff options
author | John Stultz <john.stultz@linaro.org> | 2013-09-17 03:54:07 +0200 |
---|---|---|
committer | John Stultz <john.stultz@linaro.org> | 2013-09-17 03:54:07 +0200 |
commit | 389e067032fbb96e439abafae848dd447e4cafb4 (patch) | |
tree | 9b5fdebaf55ad4e9d195412dbfbf10a7a8042aea /mm/percpu.c | |
parent | Merge branch 'fortglx/3.12/sched-clock64-base' into fortglx/3.13/time (diff) | |
parent | ntp: Make periodic RTC update more reliable (diff) | |
download | linux-389e067032fbb96e439abafae848dd447e4cafb4.tar.xz linux-389e067032fbb96e439abafae848dd447e4cafb4.zip |
Merge branch 'fortglx/3.12/time' into fortglx/3.13/time
Merge in the timekeeping changes that missed 3.12
Signed-off-by: John Stultz <john.stultz@linaro.org>
Diffstat (limited to 'mm/percpu.c')
0 files changed, 0 insertions, 0 deletions