| commit | 8a749de5e32d2b72def93f7bd7a2745580d75872 | [log] [tgz] |
|---|---|---|
| author | Ingo Molnar <mingo@kernel.org> | Thu Oct 10 06:25:23 2013 +0200 |
| committer | Ingo Molnar <mingo@kernel.org> | Thu Oct 10 06:25:23 2013 +0200 |
| tree | e46d9059d0328bcb2faea1c084d17f749338cfe4 | |
| parent | a44eb870f815356dac56adf3a380ee9b94787424 [diff] | |
| parent | b4042ceaabbd913bc5b397ddd1e396eeb312d72f [diff] |
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>