tree ae26087fe98636cc04d8914452782b9a54b9f777
parent d1a8c54b704a4bcf62c0c109ec764277f0bcc57d
parent 5e540a5a7fd145ff7b2cdf8779b53349287c64a9
author Olof Johansson <olof@lixom.net> 1327648337 -0800
committer Olof Johansson <olof@lixom.net> 1327648337 -0800

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