From: Olof Johansson <olof@lixom.net>
Date: Fri, 27 Jan 2012 07:12:17 +0000 (-0800)
Subject: Merge branch 'imx6/fixes' of git://git.linaro.org/people/shawnguo/linux-2.6 into... 
X-Git-Tag: firefly_0821_release~3680^2~3622^2~2
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=3c8cee3b408ba3d2e2527eef734b5503ac5c9188;hp=3c8cee3b408ba3d2e2527eef734b5503ac5c9188;p=firefly-linux-kernel-4.4.55.git

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
---