Merge branch 'fortglx/3.13/time' of git://git.linaro.org/people/jstultz/linux into...

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>

diff --cc drivers/clocksource/arm_arch_timer.c
Simple merge