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)
commit3c8cee3b408ba3d2e2527eef734b5503ac5c9188
treeae26087fe98636cc04d8914452782b9a54b9f777
parentd1a8c54b704a4bcf62c0c109ec764277f0bcc57d
parent5e540a5a7fd145ff7b2cdf8779b53349287c64a9
Merge branch 'imx6/fixes' of git://git.linaro.org/people/shawnguo/linux-2.6 into fixes

* 'imx6/fixes' of git://git.linaro.org/people/shawnguo/linux-2.6:
  ARM: imx6: add missing twd_clk for imx6q clock