projects / GitHub / LineageOS / android_kernel_motorola_exynos9610.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 272b98c e7e3ff1)
Merge branch 'fortglx/3.12/sched-clock64-base' into fortglx/3.13/time
authorJohn Stultz <john.stultz@linaro.org>
Tue, 17 Sep 2013 01:52:52 +0000 (18:52 -0700)
committerJohn Stultz <john.stultz@linaro.org>
Tue, 17 Sep 2013 01:52:52 +0000 (18:52 -0700)
Merge in 64bit sched_clock support that missed 3.12.

Conflicts:
kernel/time/sched_clock.c

Signed-off-by: John.Stultz <john.stultz@linaro.org>

Trivial merge