Merge branch 'pm-wakeirq'