]> www.infradead.org Git - users/willy/xarray.git/commitdiff
projects / users / willy / xarray.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: a44eb87 b4042ce)
Merge branch 'fortglx/3.13/time' of git://git.linaro.org/people/jstultz/linux into...
authorIngo Molnar <mingo@kernel.org>
Thu, 10 Oct 2013 04:25:23 +0000 (06:25 +0200)
committerIngo Molnar <mingo@kernel.org>
Thu, 10 Oct 2013 04:25:23 +0000 (06:25 +0200)
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>
1  2 
drivers/clocksource/arm_arch_timer.c patch | diff1 | diff2 | blob | history

diff --cc drivers/clocksource/arm_arch_timer.c
Simple merge
XArray, radix tree and IDR