| commit | 376249cf57b4e5516ba88f8ed8d45272e793cfb9 | [log] [tgz] |
|---|---|---|
| author | Arnd Bergmann <arnd@arndb.de> | Tue Aug 07 11:22:14 2012 +0200 |
| committer | Arnd Bergmann <arnd@arndb.de> | Tue Aug 07 11:22:14 2012 +0200 |
| tree | 9669fe20fbd1719c1e13c1b3136e767cc9f278a0 | |
| parent | 3b6c9440873d97728998854feb3bc5ffb827dd99 [diff] | |
| parent | 9de76b6df70003b657d907571b17ac3c17cd9082 [diff] |
Merge tag 'imx-fixes' of git://git.pengutronix.de/git/imx/linux-2.6 into fixes ARM i.MX fixes for 3.6-rc * tag 'imx-fixes' of git://git.pengutronix.de/git/imx/linux-2.6: i.MX27: Fix emma-prp and csi clocks. ARM: clk-imx31: Fix the keypad clock name ARM: dts: imx27-3ds.dts: Fix serial console node