| commit | be8fd292f9b1ed787a04cb4437f7faef16c4afef | [log] [tgz] |
|---|---|---|
| author | Arnd Bergmann <arnd@arndb.de> | Tue Feb 19 22:45:33 2013 +0100 |
| committer | Arnd Bergmann <arnd@arndb.de> | Tue Feb 19 22:45:33 2013 +0100 |
| tree | 9f9c534a6873b6e6b68d479d96bb1ef6fec62d76 | |
| parent | f12a500e4adcc0961803e54b5ed1e74275d399f1 [diff] | |
| parent | 4b526ca5f627188425184a22ed46c91baa602d43 [diff] |
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 <arnd@arndb.de>