Merge branch 'pm-cpufreq' into bleeding-edge

* pm-cpufreq:
  intel_pstate: add sample time scaling
  intel_pstate: Correct rounding in busy calculation
  intel_pstate: Remove C0 tracking
  Documentation: devicetree: Add boost-frequency binding to list boost mode frequency
  cpufreq / OPP: Allow boost frequency to be looked up from device tree
  cpufreq: handle calls to ->target_index() in separate routine
Merge branch 'pm-sleep' into bleeding-edge

* pm-sleep:
  PM / sleep: unregister wakeup source when disabling device wakeup
Merge branch 'acpi-battery' into bleeding-edge

* acpi-battery:
  ACPI / battery: wakeup the system only when necessary
  power_supply: allow power supply devices registered w/o wakeup source
  ACPI / battery: introduce support for POWER_SUPPLY_PROP_CAPACITY_LEVEL
Merge branch 'acpi-enumeration' into bleeding-edge

* acpi-enumeration:
  ACPI / scan: use platform bus type by default for _HID enumeration
  ACPI / scan: always register ACPI LPSS scan handler
  ACPI / scan: always register memory hotplug scan handler
  ACPI / scan: always register container scan handler
  ACPI / scan: Change the meaning of missing .attach() in scan handlers
  ACPI / scan: introduce platform_id device PNP type flag
  ACPI / scan: drop unsupported serial IDs from PNP ACPI scan handler ID list
  ACPI / scan: drop IDs that do not comply with the ACPI PNP ID rule
  ACPI / PNP: use device ID list for PNPACPI device enumeration
  ACPI / scan: .match() callback for ACPI scan handlers