From: Arnd Bergmann Date: Tue, 17 Jul 2012 20:41:50 +0000 (+0200) Subject: Merge tag 'imx-clk' of git://git.pengutronix.de/git/imx/linux-2.6 into next/clk X-Git-Tag: firefly_0821_release~3680^2~2390^2 X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=36c678f3c91ac92e9524abcf9b39f9f539d60279;p=firefly-linux-kernel-4.4.55.git Merge tag 'imx-clk' of git://git.pengutronix.de/git/imx/linux-2.6 into next/clk From Sascha Hauer : i.MX clk noncritical fixes and updates * tag 'imx-clk' of git://git.pengutronix.de/git/imx/linux-2.6: ARM: imx: clk-imx31: Fix clock id for rnga driver ARM: imx: add missing item to the list of clock event modes ARM: i.MX5x CSPI: Fixed clock name for CSPI ARM: i.MX5x clocks: Fix GPT clocks ARM: i.MX5x clocks: Fix parent for PWM clocks ARM: i.MX5x clocks: Add EPIT support ARM: mx27: Reenable silicon version print ARM: clk-imx27: Fix rtc clock id Signed-off-by: Arnd Bergmann --- 36c678f3c91ac92e9524abcf9b39f9f539d60279