diff options
| author | Ingo Molnar <mingo@kernel.org> | 2013-10-10 06:25:23 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2013-10-10 06:25:23 +0200 |
| commit | 8a749de5e32d2b72def93f7bd7a2745580d75872 (patch) | |
| tree | e46d9059d0328bcb2faea1c084d17f749338cfe4 /drivers/clocksource/time-orion.c | |
| parent | Merge branch 'clockevents/3.13' of git://git.linaro.org/people/dlezcano/linux... (diff) | |
| parent | sched_clock: Remove sched_clock_func() hook (diff) | |
| download | linux-8a749de5e32d2b72def93f7bd7a2745580d75872.tar.xz linux-8a749de5e32d2b72def93f7bd7a2745580d75872.zip | |
Merge branch 'fortglx/3.13/time' of git://git.linaro.org/people/jstultz/linux into timers/core
Pull more timekeeping items for v3.13 from John Stultz:
* Small cleanup in the clocksource code.
* Fix for rtc-pl031 to let it work with alarmtimers.
* Move arm64 to using the generic sched_clock framework & resulting
cleanup in the generic sched_clock code.
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'drivers/clocksource/time-orion.c')
0 files changed, 0 insertions, 0 deletions