From: John Stultz <john.stultz@linaro.org>
Date: Tue, 17 Sep 2013 01:52:52 +0000 (-0700)
Subject: Merge branch 'fortglx/3.12/sched-clock64-base' into fortglx/3.13/time
X-Git-Tag: v3.13-rc1~147^2~15
X-Git-Url: http://pileus.org/git/?p=~andy%2Flinux;a=commitdiff_plain;h=19c3205ceaffc8f860acf61537fa211087e4b8fc

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>
---

19c3205ceaffc8f860acf61537fa211087e4b8fc