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)
commit19c3205ceaffc8f860acf61537fa211087e4b8fc
tree36a232e278c4d7f8d893ba211aec7c8d07743e09
parent272b98c6455f00884f0350f775c5342358ebb73f
parente7e3ff1bfe9c42ee31172e9afdc0383a9e595e29
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>