Merge branch 'acpi-bus' into linux-next

* acpi-bus:
  ACPI: bus: Avoid confusing complaints regarding missing _OSC features