commit | 7996bad8e62d8ca5888a935185ce313e693814b2 | [log] [tgz] |
---|---|---|
author | Olof Johansson <olof@lixom.net> | Fri Jan 06 12:44:05 2012 -0800 |
committer | Olof Johansson <olof@lixom.net> | Fri Jan 06 12:44:05 2012 -0800 |
tree | 143009838741ddff77315bdf4d8f41a7db6d3c5b | |
parent | 8b69791215857e3e885d27b3945759ace820794a [diff] | |
parent | 1bd51cdd91a5cbe9c4379ab5d74a4015ffdf0e51 [diff] |
Merge branch 'imx/pm2' of git://git.linaro.org/people/shawnguo/linux-2.6 into imx6/pm