| commit | 1e72fe1fca4490474984d6356bbf66e2daa89f73 | [log] [tgz] |
|---|---|---|
| author | Arnd Bergmann <arnd@arndb.de> | Thu Aug 23 17:02:42 2012 +0200 |
| committer | Arnd Bergmann <arnd@arndb.de> | Thu Aug 23 17:02:42 2012 +0200 |
| tree | 12d95820cbb2083a6c78cfe550a0f9b20b1246eb | |
| parent | 8a211d362cc94df2bb42323ab13d258650529bec [diff] | |
| parent | a46d2619d7180bda12bad2bf15bbd0731dfc2dcf [diff] |
Merge branch 'imx/fixes-for-3.6' of git://git.linaro.org/people/shawnguo/linux-2.6 into fixes * 'imx/fixes-for-3.6' of git://git.linaro.org/people/shawnguo/linux-2.6: ARM: dts: imx51-babbage: fix esdhc cd/wp properties ARM: imx6: spin the cpu until hardware takes it down ARM i.MX6q: Add virtual 1/3.5 dividers in the LDB clock path Also updates to Linux 3.6-rc2 Signed-off-by: Arnd Bergmann <arnd@arndb.de>