linux-imx

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>