Merge remote-tracking branch 'mturquette/clk-3.7' into mxs/dt-for-3.7-2
authorShawn Guo <shawn.guo@linaro.org>
Mon, 17 Sep 2012 06:26:40 +0000 (14:26 +0800)
committerShawn Guo <shawn.guo@linaro.org>
Mon, 17 Sep 2012 06:26:40 +0000 (14:26 +0800)
1  2 
arch/arm/Kconfig
arch/arm/mach-ux500/Kconfig

Simple merge
Simple merge