From: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Date: Thu, 18 Oct 2018 10:37:51 +0000 (+0200)
Subject: Merge branches 'acpi-property' and 'acpi-sbs'
X-Git-Tag: for-linus-20181026~68^2
X-Git-Url: https://git.kernel.dk/?a=commitdiff_plain;h=0a1875ad29ef6436da3c184494b509697c8e0cf7;p=linux-2.6-block.git

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
---

0a1875ad29ef6436da3c184494b509697c8e0cf7