From: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Date: Mon, 17 Mar 2014 12:48:18 +0000 (+0100)
Subject: Merge branch 'acpi-ost'
X-Git-Tag: v3.15-rc1~151^2~11
X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=2eb060975df2aaca635801dcfb99eaa45ede98fe;p=~emulex%2Finfiniband.git

Merge branch 'acpi-ost'

* acpi-ost:
  ACPI: Drop acpi_evaluate_hotplug_ost() and ACPI_HOTPLUG_OST
  ACPI: use device name LNXSYBUS.xx for ACPI \_SB and \_TZ objects
  ACPI / processor: use acpi_evaluate_ost() to replace open-coded version
  ACPI / PAD / xen: use acpi_evaluate_ost() to replace open-coded version
  ACPI / PAD: use acpi_evaluate_ost() to replace open-coded version
  ACPI: rename acpi_evaluate_hotplug_ost() to acpi_evaluate_ost()
---

2eb060975df2aaca635801dcfb99eaa45ede98fe