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

Conflicts:
	arch/mips/loongson/lemote-2f/clock.c
	drivers/cpufreq/exynos-cpufreq.c
	drivers/cpufreq/exynos-cpufreq.h

diff --cc MAINTAINERS
Simple merge

diff --cc arch/mips/loongson/lemote-2f/clock.c
index 67dd94ef28e60f4023b16f7da8fac716c558b3bf,1eed38e28b1e19f95584f64e84c66145b2ff9638..ebfb9cd71ca1b92939346071356792df63b7a2ff
--- 1/arch/mips/loongson/lemote-2f/clock.c
--- 2/arch/mips/loongson/lemote-2f/clock.c
+++ b/arch/mips/loongson/lemote-2f/clock.c
@@@ -91,10 -91,9 +91,10 @@@ EXPORT_SYMBOL(clk_put)
  
  int clk_set_rate(struct clk *clk, unsigned long rate)
  {
 +      unsigned int rate_khz = rate / 1000;
+       struct cpufreq_frequency_table *pos;
        int ret = 0;
        int regval;
-       int i;
  
        if (likely(clk->ops && clk->ops->set_rate)) {
                unsigned long flags;
@@@ -107,15 -106,10 +107,10 @@@
        if (unlikely(clk->flags & CLK_RATE_PROPAGATES))
                propagate_rate(clk);
  
-       for (i = 0; loongson2_clockmod_table[i].frequency != CPUFREQ_TABLE_END;
-            i++) {
-               if (loongson2_clockmod_table[i].frequency ==
-                   CPUFREQ_ENTRY_INVALID)
-                       continue;
-               if (rate_khz == loongson2_clockmod_table[i].frequency)
+       cpufreq_for_each_valid_entry(pos, loongson2_clockmod_table)
 -              if (rate == pos->frequency)
++              if (rate_khz == pos->frequency)
                        break;
-       }
-       if (rate_khz != loongson2_clockmod_table[i].frequency)
 -      if (rate != pos->frequency)
++      if (rate_khz != pos->frequency)
                return -ENOTSUPP;
  
        clk->rate = rate;

diff --cc drivers/cpufreq/exynos-cpufreq.c
index e8a4a7ed38c165f7a785f6539c6f1b06d39fa7dd,c3e55aa28cf87de7da5bbad69ff74f2385578f84..7c2a096c6647ca6886b90a06a5607045147ad7c1
--- 1/drivers/cpufreq/exynos-cpufreq.c
--- 2/drivers/cpufreq/exynos-cpufreq.c
+++ b/drivers/cpufreq/exynos-cpufreq.c
@@@ -164,22 -163,16 +164,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 (soc_is_exynos5250())
 +      } else if (of_machine_is_compatible("samsung,exynos4412")) {
 +              exynos_info->type = EXYNOS_SOC_4412;
 +              ret = exynos4x12_cpufreq_init(exynos_info);
 +      } 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 f189547bb4479f53717d209466768f76a7cbfc26,b72ff10a040ef1ddebf73d7d57aec7eddb1b94ca..a28ee9dc9745ed8ea7504fc20a22cc2be51089c1
--- 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 9902d052bd87a49cee52fc0ee90ae891c6cc91ce,534fff5758235cd406130d84576fc8894a8a0a76..a15dda38da5b60a3d9c5367c782dbe95800548b1
--- 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/suspend.h
Simple merge