]> Git Repo - linux.git/commitdiff
projects / linux.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | compact (merge: 272b98c e7e3ff1)
Merge branch 'fortglx/3.12/sched-clock64-base' into fortglx/3.13/time
authorJohn Stultz <[email protected]>
Tue, 17 Sep 2013 01:52:52 +0000 (18:52 -0700)
committerJohn Stultz <[email protected]>
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 <[email protected]>

Trivial merge
Empty description
This page took 0.06303 seconds and 4 git commands to generate.