Merge branch 'mxs/clk' of git://git.linaro.org/people/shawnguo/linux-2.6 into next/soc
authorOlof Johansson <olof@lixom.net>
Tue, 7 Feb 2012 23:13:59 +0000 (15:13 -0800)
committerOlof Johansson <olof@lixom.net>
Tue, 7 Feb 2012 23:13:59 +0000 (15:13 -0800)
* '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


Trivial merge