Merge branches 'pm-wakeup' and 'pm-domains'