OSDN Git Service

Merge branches 'clk/mxs' and 'imx/pinctrl/for-3.5' into mxs/dt/for-3.5
authorShawn Guo <shawn.guo@linaro.org>
Sat, 12 May 2012 05:32:09 +0000 (13:32 +0800)
committerShawn Guo <shawn.guo@linaro.org>
Sat, 12 May 2012 05:32:09 +0000 (13:32 +0800)
commit844d0b5a0b42d6c73114a1dc229db751120d226f
treefaf9f83e78ae24f6730d64999a89c35144da3b8a
parent50260924afd4b745bfb6e5f1caee381a1875fc31
parenta0f5e3631b07cabf624e7d818df76d47d9d21017
Merge branches 'clk/mxs' and 'imx/pinctrl/for-3.5' into mxs/dt/for-3.5
arch/arm/Kconfig
arch/arm/mach-mxs/include/mach/common.h
arch/arm/mach-mxs/mach-mx28evk.c
drivers/i2c/busses/i2c-mxs.c