Merge branch 'imx/dt-for-3.6' of git://git.linaro.org/people/shawnguo/linux-2.6 into...
authorArnd Bergmann <arnd@arndb.de>
Fri, 6 Jul 2012 19:09:33 +0000 (21:09 +0200)
committerArnd Bergmann <arnd@arndb.de>
Fri, 6 Jul 2012 19:09:33 +0000 (21:09 +0200)
commit3858f8f91a3dc846ed053579c2a1204bc5d0f18e
tree112827aa674cbff93862e06b153f714da6c53bae
parent059eab45637b23c661bb00514950e7a449d04b4b
parent77ac32ad2b03baa7638aadda1650200287ca6f5d
Merge branch 'imx/dt-for-3.6' of git://git.linaro.org/people/shawnguo/linux-2.6 into next/dt

From Shawn Guo <shawn.guo@linaro.org>:

* 'imx/dt-for-3.6' of git://git.linaro.org/people/shawnguo/linux-2.6:
  ARM: imx6q: add clocks for gpmi-nand
  ARM: imx: enable flexcan on imx25, imx35, imx53, imx6q
  ARM: imx6q: add DT node for gpmi nand
  ARM: imx6q: add clock for apbh-dma
  ARM: imx6q: add DT node for apbh-dma

Signed-off-by: Arnd Bergmann <arnd@arndb.de>