Merge branches 'acpi-property' and 'acpi-sbs'
authorRafael J. Wysocki <rafael.j.wysocki@intel.com>
Thu, 18 Oct 2018 10:37:51 +0000 (12:37 +0200)
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>
Thu, 18 Oct 2018 10:37:51 +0000 (12:37 +0200)
commit0a1875ad29ef6436da3c184494b509697c8e0cf7
tree09411e24ed5ac1adf35503df2d59417e704fb78c
parent1f825f74c1132cea03a9edf02475ffb7715731dc
parentd030fd0ec5c782e6813a7d684029758041ba3b46
parent757c968c442397f1249bb775a7c8c03842e3e0c7
Merge branches 'acpi-property' and 'acpi-sbs'

* acpi-property:
  ACPI / property: Switch to bitmap_zalloc()

* acpi-sbs:
  ACPI / SBS: Fix rare oops when removing modules
  ACPI / SBS: Fix GPE storm on recent MacBookPro's
drivers/acpi/osl.c