Merge branch 'imx/soc' into imx/dt
authorShawn Guo <shawn.guo@linaro.org>
Mon, 30 Mar 2015 08:37:04 +0000 (16:37 +0800)
committerShawn Guo <shawn.guo@linaro.org>
Mon, 30 Mar 2015 08:37:04 +0000 (16:37 +0800)
commit40cb1981b387f70ae750da57c2310539f4b813c7
treef4ce9858c92a8619578104b325ec299f71652d14
parentdc98b0cb6175016f31c8ef1685dd0d69476aa495
parentae4aee959f7959427e99edb3927c9512986cbdc5
Merge branch 'imx/soc' into imx/dt
arch/arm/mach-imx/Kconfig