]> git.kernelconcepts.de Git - karo-tx-linux.git/commit
projects / karo-tx-linux.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 7ded379 cb1110c)
Merge branch 'next/soc' into for-next
authorKevin Hilman <khilman@linaro.org>
Thu, 17 Oct 2013 22:31:03 +0000 (15:31 -0700)
committerKevin Hilman <khilman@linaro.org>
Thu, 17 Oct 2013 22:31:54 +0000 (15:31 -0700)
commitf04b2f2d41c4da8f2e5ca75e634a3362049eaed3
treeff76b9270cdeec38fc6822b6324e48c1dd886405tree | snapshot
parent7ded3792fc712296d133019923b741048d73ae61commit | diff
parentcb1110ca797812699fea5a8285dd668a16d5387ecommit | diff
Merge branch 'next/soc' into for-next

* next/soc:
  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

Signed-off-by: Kevin Hilman <khilman@linaro.org>
Conflicts:
arch/arm/mach-highbank/highbank.c
arch/arm/arm-soc-for-next-contents.txt diff1 | | blob | history
arch/arm/mach-highbank/Kconfig diff1 | diff2 | blob | history
arch/arm/mach-highbank/highbank.c diff1 | diff2 | blob | history
Linux kernel for KaRo TX COM modules