Merge branch 'imx/pm2' of git://git.linaro.org/people/shawnguo/linux-2.6 into imx6/pm
commit7996bad8e62d8ca5888a935185ce313e693814b2
authorOlof Johansson <olof@lixom.net>
Fri, 6 Jan 2012 20:44:05 +0000 (6 12:44 -0800)
committerOlof Johansson <olof@lixom.net>
Fri, 6 Jan 2012 20:44:05 +0000 (6 12:44 -0800)
tree143009838741ddff77315bdf4d8f41a7db6d3c5b
parent8b69791215857e3e885d27b3945759ace820794a
parent1bd51cdd91a5cbe9c4379ab5d74a4015ffdf0e51
Merge branch 'imx/pm2' of git://git.linaro.org/people/shawnguo/linux-2.6 into imx6/pm
arch/arm/mach-imx/head-v7.S