Merge branch 'next/soc' into for-next

* next/soc:
  ARM: EXYNOS: allow cpuidle driver usage on Exynos3250 SoC
  ARM: EXYNOS: add AFTR mode support for Exynos3250
  ARM: EXYNOS: add code for setting/clearing boot flag
  ARM: EXYNOS: fix CPU1 hotplug on Exynos3250
  ARM: S3C64XX: Use fixed IRQ bases to avoid conflicts on Cragganmore
  ARM: EXYNOS: Remove left over 'extra_save'
  ARM: EXYNOS: Constify exynos_pm_data array
  ARM: EXYNOS: use static in suspend.c
  ARM: EXYNOS: Use platform device name as power domain name
  ARM: EXYNOS: add support for async-bridge clocks for pm_domains

Signed-off-by: Olof Johansson <olof@lixom.net>

diff --cc arch/arm/mach-exynos/exynos.c
Simple merge

diff --cc arch/arm/mach-exynos/platsmp.c
index d2e9f12d12f187e1e2c40f11748f75bbe0a283f2,511b81ac2a1811716d40425bedbe40af9a58fc28..ebd135bb0995611517c1bce6d3b70deeeee37de4
--- 1/arch/arm/mach-exynos/platsmp.c
--- 2/arch/arm/mach-exynos/platsmp.c
+++ b/arch/arm/mach-exynos/platsmp.c
@@@ -126,7 -126,10 +126,9 @@@ static inline void platform_do_lowpower
   */
  void exynos_cpu_power_down(int cpu)
  {
 -      if (cpu == 0 && (of_machine_is_compatible("samsung,exynos5420") ||
 -              of_machine_is_compatible("samsung,exynos5800"))) {
+       u32 core_conf;
+ 
 +      if (cpu == 0 && (soc_is_exynos5420() || soc_is_exynos5800())) {
                /*
                 * Bypass power down for CPU0 during suspend. Check for
                 * the SYS_PWR_REG value to decide if we are suspending

diff --cc arch/arm/mach-exynos/pm.c
Simple merge

diff --cc arch/arm/mach-exynos/pm_domains.c
Simple merge

diff --cc arch/arm/mach-exynos/suspend.c
Simple merge