Merge branch 'imx/dt-for-3.6' of git://git.linaro.org/people/shawnguo/linux-2.6 into...
authorArnd Bergmann <arnd@arndb.de>
Thu, 12 Jul 2012 12:49:00 +0000 (14:49 +0200)
committerArnd Bergmann <arnd@arndb.de>
Thu, 12 Jul 2012 15:37:05 +0000 (17:37 +0200)
commit8d5776d5fed6c3d2d5b5bce9512faa41321d6a8a
tree4cbb5a92c3d6a8d340fc817b2afcd167f865f312
parente95f2e790e98c61eb88caa5ee31a04e1dc7a8c59
parent9d5f6b51bdaff83b85069a2eee7a89c562a5daba
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>:

Here is the second (last) batch of imx device tree changes for 3.6.

* 'imx/dt-for-3.6' of git://git.linaro.org/people/shawnguo/linux-2.6:
  ARM: imx6q: ensure ANATOP controller is available
  ARM: dts: imx6q-sabrelite: add ecspi1 pinctrl support
  ARM: dts: imx6q-sabrelite: add usb devices
  ARM: imx6q: disable usb charger detector
  ARM: imx6q: add usbphy clocks
  ARM: imx6q: add usb controller clock lookups
  ARM: dts: imx: update #interrupt-cells for gpio nodes
  bindings: update imx and mxs #gpio-cells

Signed-off-by: Arnd Bergmann <arnd@arndb.de>
arch/arm/mach-imx/Kconfig