From: Olof Johansson Date: Tue, 17 Sep 2013 16:08:24 +0000 (-0700) Subject: Merge tag 'imx-fixes-3.12' of git://git.linaro.org/people/shawnguo/linux-2.6 into fixes X-Git-Tag: v3.12-rc2~13^2~5 X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=commitdiff_plain;h=ab5c3b6b5199f30a567335e07ede4dc3face7ec1;p=linux.git Merge tag 'imx-fixes-3.12' of git://git.linaro.org/people/shawnguo/linux-2.6 into fixes From Shawn Guo, imx fixes for 3.12: * A couple of clock driver and device tree fixes * A bug fix for clk-fixup-mux to get imx6sl back to boot * A L2 cache setting fix for imx6q * One pinctrl macro fix for UART2 DTE entries * tag 'imx-fixes-3.12' of git://git.linaro.org/people/shawnguo/linux-2.6: ARM: dts: imx6q: fix the wrong offset of the Pad Mux register ARM: imx: i.mx6d/q: disable the double linefill feature of PL310 ARM: imx51.dtsi: fix PATA device clock ARM: mach-imx: clk-imx51-imx53: Fix 'spdif1_pred' clock registration ARM: imx: initialize clk_init_data.flags for clk-fixup-mux ARM: imx27.dtsi: fix CSPI PER clock id Signed-off-by: Olof Johansson --- ab5c3b6b5199f30a567335e07ede4dc3face7ec1