summaryrefslogtreecommitdiffstats
path: root/drivers/clocksource
diff options
context:
space:
mode:
authorJohn Stultz <john.stultz@linaro.org>2013-09-17 03:54:07 +0200
committerJohn Stultz <john.stultz@linaro.org>2013-09-17 03:54:07 +0200
commit389e067032fbb96e439abafae848dd447e4cafb4 (patch)
tree9b5fdebaf55ad4e9d195412dbfbf10a7a8042aea /drivers/clocksource
parentMerge branch 'fortglx/3.12/sched-clock64-base' into fortglx/3.13/time (diff)
parentntp: Make periodic RTC update more reliable (diff)
downloadlinux-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 'drivers/clocksource')
0 files changed, 0 insertions, 0 deletions