Add PM changes from 2.6.32