Merge branch 'imx6/fixes' of git://git.linaro.org/people/shawnguo/linux-2.6 into...
authorOlof Johansson <olof@lixom.net>
Fri, 27 Jan 2012 07:12:17 +0000 (23:12 -0800)
committerOlof Johansson <olof@lixom.net>
Fri, 27 Jan 2012 07:12:17 +0000 (23:12 -0800)
* 'imx6/fixes' of git://git.linaro.org/people/shawnguo/linux-2.6:
  ARM: imx6: add missing twd_clk for imx6q clock


Trivial merge