| commit | 19c3205ceaffc8f860acf61537fa211087e4b8fc | [log] [tgz] |
|---|---|---|
| author | John Stultz <john.stultz@linaro.org> | Mon Sep 16 18:52:52 2013 -0700 |
| committer | John Stultz <john.stultz@linaro.org> | Mon Sep 16 18:52:52 2013 -0700 |
| tree | 36a232e278c4d7f8d893ba211aec7c8d07743e09 | |
| parent | 272b98c6455f00884f0350f775c5342358ebb73f [diff] | |
| parent | e7e3ff1bfe9c42ee31172e9afdc0383a9e595e29 [diff] |
Merge branch 'fortglx/3.12/sched-clock64-base' into fortglx/3.13/time 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>