Merge branch 'acpi-fixes'
authorRafael J. Wysocki <rafael.j.wysocki@intel.com>
Wed, 7 Aug 2013 20:55:27 +0000 (22:55 +0200)
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>
Wed, 7 Aug 2013 20:55:27 +0000 (22:55 +0200)
* acpi-fixes:
  ACPI: Try harder to resolve _ADR collisions for bridges
  ACPI / processor: move try_offline_node() after acpi_unmap_lsapic()
  ACPI: Drop physical_node_id_bitmap from struct acpi_device
  ACPI / PM: Walk physical_node_list under physical_node_lock
  ACPI / video: improve quirk check in acpi_video_bqc_quirk()


Trivial merge