tree e46d9059d0328bcb2faea1c084d17f749338cfe4
parent a44eb870f815356dac56adf3a380ee9b94787424
parent b4042ceaabbd913bc5b397ddd1e396eeb312d72f
author Ingo Molnar <mingo@kernel.org> 1381379123 +0200
committer Ingo Molnar <mingo@kernel.org> 1381379123 +0200

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>