| commit | 88b1988ec2337f5fd8b9204a919838d0bc34b7b4 | [log] [tgz] |
|---|---|---|
| author | Olof Johansson <olof@lixom.net> | Tue Feb 07 15:13:59 2012 -0800 |
| committer | Olof Johansson <olof@lixom.net> | Tue Feb 07 15:13:59 2012 -0800 |
| tree | cc6e781cd62a46ac8117f6838c95b805df639aad | |
| parent | afd96f8335dd1f54bf41a3485c564dfb50f490c5 [diff] | |
| parent | 444a7c3bb897ec6a64b83d277102440c1dcc22a1 [diff] |
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