Merge branch 'pm-assorted-next' into bleeding-edge

* pm-assorted-next:
  PM: Add pm_ops_ptr() macro
Merge branch 'acpi-hotplug-next' into bleeding-edge

* acpi-hotplug-next:
  ACPI / processor: Use common hotplug infrastructure
  ACPI / hotplug: Use device offline/online for graceful hot-removal
  Driver core: Use generic offline/online for CPU offline/online
  Driver core: Add offline/online device operations