Merge branch 'fixes' into for-next

diff --cc MAINTAINERS
Simple merge

diff --cc arch/arm/configs/imx_v6_v7_defconfig
Simple merge

diff --cc arch/arm/mach-imx/clk-imx25.c
index fd8b27f965dfde0f9294acdbc0e5d5f08ee4bf04,840fdfac52bcbef677a1ef5cc823787a9de7741d..60d0902b18698e93935052fa355ff6559389d7d8
--- 1/arch/arm/mach-imx/clk-imx25.c
--- 2/arch/arm/mach-imx/clk-imx25.c
+++ b/arch/arm/mach-imx/clk-imx25.c
@@@ -203,18 -203,18 +203,18 @@@ int __init mx25_clocks_init(void
        clk_register_clkdev(clk[cspi2_ipg], NULL, "imx35-cspi.1");
        clk_register_clkdev(clk[cspi3_ipg], NULL, "imx35-cspi.2");
        clk_register_clkdev(clk[pwm1_ipg], "ipg", "mxc_pwm.0");
-       clk_register_clkdev(clk[per10], "per", "mxc_pwm.0");
+       clk_register_clkdev(clk[pwm_ipg_per], "per", "mxc_pwm.0");
        clk_register_clkdev(clk[pwm1_ipg], "ipg", "mxc_pwm.1");
-       clk_register_clkdev(clk[per10], "per", "mxc_pwm.1");
+       clk_register_clkdev(clk[pwm_ipg_per], "per", "mxc_pwm.1");
        clk_register_clkdev(clk[pwm1_ipg], "ipg", "mxc_pwm.2");
-       clk_register_clkdev(clk[per10], "per", "mxc_pwm.2");
+       clk_register_clkdev(clk[pwm_ipg_per], "per", "mxc_pwm.2");
        clk_register_clkdev(clk[pwm1_ipg], "ipg", "mxc_pwm.3");
-       clk_register_clkdev(clk[per10], "per", "mxc_pwm.3");
+       clk_register_clkdev(clk[pwm_ipg_per], "per", "mxc_pwm.3");
        clk_register_clkdev(clk[kpp_ipg], NULL, "imx-keypad");
        clk_register_clkdev(clk[tsc_ipg], NULL, "mx25-adc");
 -      clk_register_clkdev(clk[i2c_ipg_per], NULL, "imx-i2c.0");
 -      clk_register_clkdev(clk[i2c_ipg_per], NULL, "imx-i2c.1");
 -      clk_register_clkdev(clk[i2c_ipg_per], NULL, "imx-i2c.2");
 +      clk_register_clkdev(clk[i2c_ipg_per], NULL, "imx21-i2c.0");
 +      clk_register_clkdev(clk[i2c_ipg_per], NULL, "imx21-i2c.1");
 +      clk_register_clkdev(clk[i2c_ipg_per], NULL, "imx21-i2c.2");
        clk_register_clkdev(clk[fec_ipg], "ipg", "imx25-fec.0");
        clk_register_clkdev(clk[fec_ahb], "ahb", "imx25-fec.0");
        clk_register_clkdev(clk[dryice_ipg], NULL, "imxdi_rtc.0");

diff --cc arch/arm/mach-imx/clk-imx27.c
Simple merge

diff --cc arch/arm/mach-imx/devices/platform-mxc-mmc.c
Simple merge

diff --cc arch/arm/mach-imx/mm-imx3.c
Simple merge