Merge branch 'acpi-platform'
authorRafael J. Wysocki <rafael.j.wysocki@intel.com>
Tue, 3 Jun 2014 21:11:52 +0000 (23:11 +0200)
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>
Tue, 3 Jun 2014 21:11:52 +0000 (23:11 +0200)
commit2770b8b1fdf03c4dad6fc8f7e38101a9c4082f7b
treefbd8bcc61d95930f42602a5598f75b64684e9f56
parenta392f7d4afb850934851fde5a8e298912650a6b8
parent8ce62f85a81f57e86bc120ab690facc612223188
Merge branch 'acpi-platform'

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