Merge branch 'next/cpufreq-exynos' into for-next

diff --cc drivers/cpufreq/exynos-cpufreq.c
Simple merge

diff --cc drivers/cpufreq/exynos-cpufreq.h
Simple merge

diff --cc drivers/cpufreq/exynos4210-cpufreq.c
index a5d0a8184220feac77aa6c38e1362ed6e12e0e24,de91755e2556b0311d9da8327d7db4f7803b49af..add7fbec4fc9af5ca3060e925cfe662a25d21eb4
--- 1/drivers/cpufreq/exynos4210-cpufreq.c
--- 2/drivers/cpufreq/exynos4210-cpufreq.c
+++ b/drivers/cpufreq/exynos4210-cpufreq.c
@@@ -18,14 -18,8 +18,9 @@@
  #include <linux/cpufreq.h>
  
  #include <mach/regs-clock.h>
 -#include <mach/cpufreq.h>
 +
 +#include "exynos-cpufreq.h"
  
- #define CPUFREQ_LEVEL_END     L5
- 
- static int max_support_idx = L0;
- static int min_support_idx = (CPUFREQ_LEVEL_END - 1);
- 
  static struct clk *cpu_clk;
  static struct clk *moutcore;
  static struct clk *mout_mpll;

diff --cc drivers/cpufreq/exynos4x12-cpufreq.c
index 63ff74eec5213ad01738bd699a25addae7c76cd2,0661039e5d4a709d6422f76fd819c7b45be0785e..08b7477b0aa23ea139faa00aef4d6eca601d173c
--- 1/drivers/cpufreq/exynos4x12-cpufreq.c
--- 2/drivers/cpufreq/exynos4x12-cpufreq.c
+++ b/drivers/cpufreq/exynos4x12-cpufreq.c
@@@ -18,14 -18,8 +18,9 @@@
  #include <linux/cpufreq.h>
  
  #include <mach/regs-clock.h>
 -#include <mach/cpufreq.h>
 +
 +#include "exynos-cpufreq.h"
  
- #define CPUFREQ_LEVEL_END     (L13 + 1)
- 
- static int max_support_idx;
- static int min_support_idx = (CPUFREQ_LEVEL_END - 1);
- 
  static struct clk *cpu_clk;
  static struct clk *moutcore;
  static struct clk *mout_mpll;

diff --cc drivers/cpufreq/exynos5250-cpufreq.c
index 407126c2d7c6ac4a32b18bf1afb6ad884ce39120,b9344869f822a5bf4845337a60bc5d60afb7412d..9fae466d7746a5fed781edb17f4838b6931ed8f0
--- 1/drivers/cpufreq/exynos5250-cpufreq.c
--- 2/drivers/cpufreq/exynos5250-cpufreq.c
+++ b/drivers/cpufreq/exynos5250-cpufreq.c
@@@ -19,13 -19,8 +19,9 @@@
  
  #include <mach/map.h>
  #include <mach/regs-clock.h>
 -#include <mach/cpufreq.h>
 +
 +#include "exynos-cpufreq.h"
  
- #define CPUFREQ_LEVEL_END     (L15 + 1)
- 
- static int max_support_idx;
- static int min_support_idx = (CPUFREQ_LEVEL_END - 1);
  static struct clk *cpu_clk;
  static struct clk *moutcore;
  static struct clk *mout_mpll;