Merge branch 'pm-fixes' of git://github.com/rjwysocki/linux-pm