]> git.proxmox.com Git - mirror_ubuntu-kernels.git/commitdiff
Merge branch 'imx/fixes-for-3.6' of git://git.linaro.org/people/shawnguo/linux-2...
authorArnd Bergmann <arnd@arndb.de>
Thu, 23 Aug 2012 15:02:42 +0000 (17:02 +0200)
committerArnd Bergmann <arnd@arndb.de>
Thu, 23 Aug 2012 15:02:42 +0000 (17:02 +0200)
* '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>

Trivial merge