Merge branch 'pm-sleep' into linux-next

* pm-sleep:
  PM: sleep: Show how long dpm_suspend_start() and dpm_suspend_end() take
  PM: hibernate: powerpc: Expose pfn_is_nosave() prototype