]> rtime.felk.cvut.cz Git - lisovros/linux_canprio.git/commit
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)
commit88b1988ec2337f5fd8b9204a919838d0bc34b7b4
treecc6e781cd62a46ac8117f6838c95b805df639aad
parentafd96f8335dd1f54bf41a3485c564dfb50f490c5
parent444a7c3bb897ec6a64b83d277102440c1dcc22a1
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