Merge branch 'next/dt2' into HEAD

Conflicts:
	arch/arm/mach-exynos/clock-exynos5.c

diff --cc arch/arm/boot/dts/exynos5250.dtsi
Simple merge

diff --cc arch/arm/mach-exynos/clock-exynos5.c
index f3171c3,17e6c77..c44ca1e
--- 1/arch/arm/mach-exynos/clock-exynos5.c
--- 2/arch/arm/mach-exynos/clock-exynos5.c
+++ b/arch/arm/mach-exynos/clock-exynos5.c
@@@ -1200,28 -1115,18 +1195,20 @@@ static struct clksrc_clk exynos5_clk_sc
        .reg_div = { .reg = EXYNOS5_CLKDIV_PERIC2, .shift = 8, .size = 8 },
  };
  
 +struct clksrc_clk exynos5_clk_sclk_fimd1 = {
 +      .clk    = {
 +              .name           = "sclk_fimd",
 +              .devname        = "exynos5-fb.1",
 +              .enable         = exynos5_clksrc_mask_disp1_0_ctrl,
 +              .ctrlbit        = (1 << 0),
 +      },
 +      .sources = &exynos5_clkset_group,
 +      .reg_src = { .reg = EXYNOS5_CLKSRC_DISP1_0, .shift = 0, .size = 4 },
 +      .reg_div = { .reg = EXYNOS5_CLKDIV_DISP1_0, .shift = 0, .size = 4 },
 +};
 +
  static struct clksrc_clk exynos5_clksrcs[] = {
        {
--              .clk    = {
-                       .name           = "sclk_dwmci",
-                       .parent         = &exynos5_clk_dout_mmc4.clk,
-                       .enable         = exynos5_clksrc_mask_fsys_ctrl,
-                       .ctrlbit        = (1 << 16),
 -                      .name           = "sclk_fimd",
 -                      .devname        = "s3cfb.1",
 -                      .enable         = exynos5_clksrc_mask_disp1_0_ctrl,
 -                      .ctrlbit        = (1 << 0),
--              },
-               .reg_div = { .reg = EXYNOS5_CLKDIV_FSYS3, .shift = 8, .size = 8 },
 -              .sources = &exynos5_clkset_group,
 -              .reg_src = { .reg = EXYNOS5_CLKSRC_DISP1_0, .shift = 0, .size = 4 },
 -              .reg_div = { .reg = EXYNOS5_CLKDIV_DISP1_0, .shift = 0, .size = 4 },
--      }, {
                .clk    = {
                        .name           = "aclk_266_gscl",
                },

diff --cc arch/arm/mach-exynos/include/mach/map.h
Simple merge

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