Skip to content
Commit 7996bad8 authored by Olof Johansson's avatar Olof Johansson
Browse files

Merge branch 'imx/pm2' of git://git.linaro.org/people/shawnguo/linux-2.6 into imx6/pm

parents 8b697912 1bd51cdd
Hide whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment