Merge branches 'clk/mxs' and 'imx/pinctrl/for-3.5' into mxs/dt/for-3.5

diff --cc arch/arm/Kconfig
index 2095a513a7c034dc54e2cc8c74b462bed3dfd34b,c67494fc05a77404fc63f61bc2b128d821bb7d46..ae5c251cd251994a5236d998651826d6b656dfd0
--- 1/arch/arm/Kconfig
--- 2/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@@ -468,8 -468,8 +468,9 @@@ config ARCH_MX
        select ARCH_REQUIRE_GPIOLIB
        select CLKDEV_LOOKUP
        select CLKSRC_MMIO
 +      select COMMON_CLK
        select HAVE_CLK_PREPARE
+       select PINCTRL
        help
          Support for Freescale MXS-based family of processors
  

diff --cc arch/arm/mach-mxs/include/mach/common.h
Simple merge

diff --cc arch/arm/mach-mxs/mach-mx28evk.c
Simple merge

diff --cc drivers/i2c/busses/i2c-mxs.c
Simple merge