From: Arnd Bergmann Date: Tue, 19 Feb 2013 21:45:33 +0000 (+0100) Subject: Merge tag 'arm-imx-clk-fixes' of git://git.pengutronix.de/git/imx/linux-2.6 into... X-Git-Tag: MMI-PSA29.97-13-9~14997^2 X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=be8fd292f9b1ed787a04cb4437f7faef16c4afef;p=GitHub%2FMotorolaMobilityLLC%2Fkernel-slsi.git Merge tag 'arm-imx-clk-fixes' of git://git.pengutronix.de/git/imx/linux-2.6 into next/fixes-non-critical ARM: i.MX: clock fixes - fix wrong timer clock on i.MX25 leading to strange timing inconsistencies - fix SPI clocks for i.MX27 * tag 'arm-imx-clk-fixes' of git://git.pengutronix.de/git/imx/linux-2.6: ARM: i.MX25: clk: parent per5_clk to AHB clock ARM: imx27: clk-imx27: SPI: Rename IPG clock and add PER clock Signed-off-by: Arnd Bergmann --- be8fd292f9b1ed787a04cb4437f7faef16c4afef