From: Olof Johansson <olof@lixom.net>
Date: Tue, 7 Feb 2012 23:13:59 +0000 (-0800)
Subject: Merge branch 'mxs/clk' of git://git.linaro.org/people/shawnguo/linux-2.6 into next/soc
X-Git-Tag: firefly_0821_release~3680^2~3250^2~12
X-Git-Url: http://plrg.eecs.uci.edu/git/?a=commitdiff_plain;h=88b1988ec2337f5fd8b9204a919838d0bc34b7b4;p=firefly-linux-kernel-4.4.55.git

Merge branch 'mxs/clk' of git://git.linaro.org/people/shawnguo/linux-2.6 into next/soc

* 'mxs/clk' of git://git.linaro.org/people/shawnguo/linux-2.6:
  ARM: mxs: Use a proper timeout mechanism
  ARM: mx28: check for gated clocks when setting saif divider
  arm/mxs: Add support for SSP/MMC ports 2 & 3
---

88b1988ec2337f5fd8b9204a919838d0bc34b7b4