From: Kevin Hilman <khilman@linaro.org>
Date: Thu, 17 Oct 2013 22:27:54 +0000 (-0700)
Subject: Merge tag 'highbank-for-3.13' of git://git.kernel.org/pub/scm/linux/kernel/git/robh... 
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=cb1110ca797812699fea5a8285dd668a16d5387e;p=linux-beck.git

Merge tag 'highbank-for-3.13' of git://git.kernel.org/pub/scm/linux/kernel/git/robh/linux into next/soc

From Rob Herring:
Highbank platform updates for 3.13

- convert Calxeda cpuidle driver to a platform driver and to use PSCI
- convert highbank smp_ops and suspend to PSCI

* tag 'highbank-for-3.13' of git://git.kernel.org/pub/scm/linux/kernel/git/robh/linux:
  dts: calxeda: add ARM PSCI binding
  ARM: highbank: adapt to use ARM PSCI calls
  ARM: PSCI: remove unnecessary include of arm-gic.h
  cpuidle: calxeda: add support to use PSCI calls
  ARM: highbank: cpuidle: convert to platform driver
  cpuidle: calxeda: add cpu_pm_enter/exit calls
---

cb1110ca797812699fea5a8285dd668a16d5387e