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

* acpi-assorted-next:
  PCI / ACPI: Don't query OSC support with all possible controls
Merge branch 'pm-cpuidle-next' into bleeding-edge

* pm-cpuidle-next:
  cpuidle: imx6: remove timer broadcast initialization
  cpuidle: OMAP4: remove timer broadcast initialization
  cpuidle: ux500: remove timer broadcast initialization
  cpuidle: initialize the broadcast timer framework
  timer: move enum definition out of ifdef section