Merge branches 'acpi-soc' and 'acpi-bus' into linux-next

* acpi-soc:
  ACPI: LPSS: Add 80862289 ACPI _HID for second PWM controller on Cherry Trail

* acpi-bus:
  ACPI: bus: Ensure that notify handlers are not running after removal
  ACPI: bus: Add missing braces to acpi_sb_notify()