Merge branch 'pm-domains' into pm-for-linus