tree b4f36fdb126eb35a9c7a5632ad1b628bbf11971d
parent ee80285e1b79e6a7a6855c8be65bddc61f4d69be
parent 1aa0cf677949dafaaff8cd1a78f1f69a239138ac
author Arnd Bergmann <arnd@arndb.de> 1330431802 +0000
committer Arnd Bergmann <arnd@arndb.de> 1330431807 +0000

Merge branch 'imx/driver' of git://git.linaro.org/people/shawnguo/linux-2.6 into next/drivers

* 'imx/driver' of git://git.linaro.org/people/shawnguo/linux-2.6: (3 commits)
  ARM: imx6q: add cko1 clock
  ARM: mxc: make imx_dma_is_general_purpose more generic for sdma
  ARM: imx6: Rename DEBUG_IMX6Q_UART to UART4