Merge branch 'next/soc2' into HEAD
authorOlof Johansson <olof@lixom.net>
Mon, 1 Oct 2012 21:26:04 +0000 (14:26 -0700)
committerOlof Johansson <olof@lixom.net>
Mon, 1 Oct 2012 21:26:04 +0000 (14:26 -0700)
commit5c008d7029fcd12a9a54fa618781b71353f6c4bd
tree666c42d0a97664131b9f62b886c51cd671066f9d
parent5d3a0a95868a9669816da193bb284121df9031c8
parent36246a820075b65907112891b77ff7915fdb06a5
Merge branch 'next/soc2' into HEAD
arch/arm/Kconfig
arch/arm/boot/dts/imx23.dtsi
arch/arm/boot/dts/imx28.dtsi
arch/arm/mach-mxs/include/mach/common.h
arch/arm/mach-mxs/mach-mxs.c
drivers/clk/mxs/clk-imx23.c
drivers/clk/mxs/clk-imx28.c