Merge remote-tracking branch 'pm/linux-next'

Conflicts:
	drivers/cpufreq/exynos-cpufreq.c
	drivers/cpufreq/exynos-cpufreq.h

diff --cc Documentation/kernel-parameters.txt
Simple merge

diff --cc MAINTAINERS
Simple merge

diff --cc drivers/clk/Makefile
Simple merge

diff --cc drivers/cpufreq/Kconfig.arm
Simple merge

diff --cc drivers/cpufreq/exynos-cpufreq.c
index 348c8bafe436247d8368989af5e9a35e3bb33057,c3e55aa28cf87de7da5bbad69ff74f2385578f84..1e0ec57bf6e35074ac00ff0b58252e2e7077d7e0
--- 1/drivers/cpufreq/exynos-cpufreq.c
--- 2/drivers/cpufreq/exynos-cpufreq.c
+++ b/drivers/cpufreq/exynos-cpufreq.c
@@@ -162,22 -163,16 +162,24 @@@ static int exynos_cpufreq_probe(struct 
        if (!exynos_info)
                return -ENOMEM;
  
 -      if (soc_is_exynos4210())
+       exynos_info->dev = &pdev->dev;
+ 
 +      if (of_machine_is_compatible("samsung,exynos4210")) {
 +              exynos_info->type = EXYNOS_SOC_4210;
                ret = exynos4210_cpufreq_init(exynos_info);
 -      else if (soc_is_exynos4212() || soc_is_exynos4412())
 +      } else if (of_machine_is_compatible("samsung,exynos4212")) {
 +              exynos_info->type = EXYNOS_SOC_4212;
 +              ret = exynos4x12_cpufreq_init(exynos_info);
 +      } else if (of_machine_is_compatible("samsung,exynos4412")) {
 +              exynos_info->type = EXYNOS_SOC_4412;
                ret = exynos4x12_cpufreq_init(exynos_info);
 -      else if (soc_is_exynos5250())
 +      } else if (of_machine_is_compatible("samsung,exynos5250")) {
 +              exynos_info->type = EXYNOS_SOC_5250;
                ret = exynos5250_cpufreq_init(exynos_info);
 -      else
 -              return 0;
 +      } else {
 +              pr_err("%s: Unknown SoC type\n", __func__);
 +              return -ENODEV;
 +      }
  
        if (ret)
                goto err_vdd_arm;

diff --cc drivers/cpufreq/exynos-cpufreq.h
index 51af42e1b7feb6eb2f9499bb63f28ca9944741cf,b72ff10a040ef1ddebf73d7d57aec7eddb1b94ca..8dfebaca1e6d31f50539cf028b6f530a439e7d01
--- 1/drivers/cpufreq/exynos-cpufreq.h
--- 2/drivers/cpufreq/exynos-cpufreq.h
+++ b/drivers/cpufreq/exynos-cpufreq.h
@@@ -41,7 -34,7 +41,8 @@@ struct apll_freq 
  };
  
  struct exynos_dvfs_info {
+       struct device   *dev;
 +      enum exynos_soc_type type;
        unsigned long   mpll_freq_khz;
        unsigned int    pll_safe_idx;
        struct clk      *cpu_clk;

diff --cc drivers/cpuidle/Kconfig.arm
Simple merge

diff --cc drivers/cpuidle/Makefile
index 5404d5d1e66adfd0b3725cf1d79b2558000d8c85,534fff5758235cd406130d84576fc8894a8a0a76..d8bb1ff72561ace55a9832e314b28450a625a25b
--- 1/drivers/cpuidle/Makefile
--- 2/drivers/cpuidle/Makefile
+++ b/drivers/cpuidle/Makefile
@@@ -7,8 -7,8 +7,9 @@@ obj-$(CONFIG_ARCH_NEEDS_CPU_IDLE_COUPLE
  
  ##################################################################################
  # ARM SoC drivers
 +obj-$(CONFIG_ARM_ARMADA_370_XP_CPUIDLE) += cpuidle-armada-370-xp.o
  obj-$(CONFIG_ARM_BIG_LITTLE_CPUIDLE)  += cpuidle-big_little.o
+ obj-$(CONFIG_ARM_CLPS711X_CPUIDLE)    += cpuidle-clps711x.o
  obj-$(CONFIG_ARM_HIGHBANK_CPUIDLE)    += cpuidle-calxeda.o
  obj-$(CONFIG_ARM_KIRKWOOD_CPUIDLE)    += cpuidle-kirkwood.o
  obj-$(CONFIG_ARM_ZYNQ_CPUIDLE)                += cpuidle-zynq.o

diff --cc include/linux/cpuidle.h
Simple merge

diff --cc include/linux/suspend.h
Simple merge