Merge branch 'clk/mxs-for-3.6' of git://git.linaro.org/people/shawnguo/linux-2.6...

diff --cc drivers/clk/mxs/clk-imx23.c
index db2391c054ee0a51805368d0a369267635375cf1,c14b021c4a681ee6560c88aa676a8a9a6f4bb821..844043ad0fe44c7b18dfee9ce05abc4218fc2f8d
--- 1/drivers/clk/mxs/clk-imx23.c
--- 2/drivers/clk/mxs/clk-imx23.c
+++ b/drivers/clk/mxs/clk-imx23.c
@@@ -104,9 -104,9 +104,9 @@@ static struct clk_lookup lcdif_lookups[
        { .dev_id = "80030000.lcdif", },
  };
  
 -static struct clk_lookup gpmi_lookups[] __initdata = {
 +static struct clk_lookup gpmi_lookups[] = {
        { .dev_id = "imx23-gpmi-nand", },
-       { .dev_id = "8000c000.gpmi", },
+       { .dev_id = "8000c000.gpmi-nand", },
  };
  
  static const char *sel_pll[]  __initconst = { "pll", "ref_xtal", };

diff --cc drivers/clk/mxs/clk-imx28.c
index 7fad6c8c13d222fc9a528191835d141d06ffcec5,98624eec5dd4bfeae9637e1f20c518e7bcc4038f..957eaaccb5f83d269ba199b4c0c3c784720f191d
--- 1/drivers/clk/mxs/clk-imx28.c
--- 2/drivers/clk/mxs/clk-imx28.c
+++ b/drivers/clk/mxs/clk-imx28.c
@@@ -172,12 -172,12 +172,12 @@@ static struct clk_lookup lcdif_lookups[
        { .dev_id = "80030000.lcdif", },
  };
  
 -static struct clk_lookup gpmi_lookups[] __initdata = {
 +static struct clk_lookup gpmi_lookups[] = {
        { .dev_id = "imx28-gpmi-nand", },
-       { .dev_id = "8000c000.gpmi", },
+       { .dev_id = "8000c000.gpmi-nand", },
  };
  
 -static struct clk_lookup fec_lookups[] __initdata = {
 +static struct clk_lookup fec_lookups[] = {
        { .dev_id = "imx28-fec.0", },
        { .dev_id = "imx28-fec.1", },
        { .dev_id = "800f0000.ethernet", },