From: Kevin Hilman <khilman@linaro.org>
Date: Fri, 6 Dec 2013 16:05:37 +0000 (-0800)
Subject: Merge branch 'soc/sched_clock' into next/soc
X-Git-Tag: v3.14-rc1~113^2~25
X-Git-Url: https://git.kernel.dk/?a=commitdiff_plain;h=b8969ef5cfa7859dbe6ac74debfd2d884d9fe14c;p=linux-2.6-block.git

Merge branch 'soc/sched_clock' into next/soc

From Stephen Boyd:
* soc/sched_clock:
  ARM: versatile: Switch to sched_clock_register()
  ARM: orion: Switch to sched_clock_register()
  ARM: OMAP: Switch to sched_clock_register()
  ARM: iop: Switch to sched_clock_register()
  ARM: u300: Switch to sched_clock_register()
  ARM: sa1100: Switch to sched_clock_register()
  ARM: pxa: Switch to sched_clock_register()
  ARM: OMAP2+: Switch to sched_clock_register()
  ARM: OMAP1: Switch to sched_clock_register()
  ARM: msm: Switch to sched_clock_register()
  ARM: mmp: Switch to sched_clock_register()
  ARM: IXP4xx: Switch to sched_clock_register()
  ARM: integrator: Switch to sched_clock_register()
  ARM: imx: Switch to sched_clock_register()
  ARM: davinci: Switch to sched_clock_register()
  ARM: clps711x: Switch to sched_clock_register()
  ARM: timer-sp: Switch to sched_clock_register()

Signed-off-by: Kevin Hilman <khilman@linaro.org>
---

b8969ef5cfa7859dbe6ac74debfd2d884d9fe14c