Merge branch 'imx/driver' of git://git.linaro.org/people/shawnguo/linux-2.6 into...
authorArnd Bergmann <arnd@arndb.de>
Tue, 28 Feb 2012 12:23:22 +0000 (12:23 +0000)
committerArnd Bergmann <arnd@arndb.de>
Tue, 28 Feb 2012 12:23:27 +0000 (12:23 +0000)
* '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


Trivial merge