From: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Date: Wed, 7 Aug 2013 20:55:27 +0000 (+0200)
Subject: Merge branch 'acpi-fixes'
X-Git-Tag: v3.11-rc5~11^2~1
X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=5ba1aef5e5eab1ad61a4a870a606ff7ab8a574d5;p=~emulex%2Finfiniband.git

Merge branch 'acpi-fixes'

* 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()
---

5ba1aef5e5eab1ad61a4a870a606ff7ab8a574d5