| commit | e135e4506c6d3e9b196890877a9a2815f71b04ac | [log] [tgz] |
|---|---|---|
| author | Arnd Bergmann <arnd@arndb.de> | Tue Feb 28 12:23:22 2012 +0000 |
| committer | Arnd Bergmann <arnd@arndb.de> | Tue Feb 28 12:23:27 2012 +0000 |
| tree | b4f36fdb126eb35a9c7a5632ad1b628bbf11971d | |
| parent | ee80285e1b79e6a7a6855c8be65bddc61f4d69be [diff] | |
| parent | 1aa0cf677949dafaaff8cd1a78f1f69a239138ac [diff] |
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