Merge branches 'acpi-tables' and 'acpi-platform'

* acpi-tables:
  ACPI: Fix conflict between customized DSDT and DSDT local copy

* acpi-platform:
  ACPI / platform / LPSS: Enable async suspend/resume of LPSS devices
  ACPI / platform: add IDs for Broadcom Bluetooth and GPS chips

diff --cc drivers/acpi/acpi_platform.c
index 1d4950388fa13b9fc6050fbaf419ae68c796f24d,dbfe49e5fd63cc179559b2c5caee57d27324c012,9f7bcfdf18ef8a2b79e7f29855df0fd89cffda6c..3bb89def22921483a60c50d0468f885a794174ed
--- 1/drivers/acpi/acpi_platform.c
--- 2/drivers/acpi/acpi_platform.c
--- 3/drivers/acpi/acpi_platform.c
+++ b/drivers/acpi/acpi_platform.c
@@@@ -29,8 -29,9 -29,13 +29,12 @@@@ ACPI_MODULE_NAME("platform")
   static const struct acpi_device_id acpi_platform_device_ids[] = {
   
        { "PNP0D40" },
 --     { "ACPI0003" },
        { "VPC2004" },
        { "BCM4752" },
++      { "LNV4752" },
++      { "BCM2E1A" },
++      { "BCM2E39" },
++      { "BCM2E3D" },
   
        /* Intel Smart Sound Technology */
        { "INT33C8" },

diff --cc drivers/acpi/bus.c
Simple merge