From: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Date: Thu, 15 May 2014 12:07:32 +0000 (+0200)
Subject: Merge branches 'acpica', 'acpi-tpm' and 'acpi-processor'
X-Git-Tag: v3.15-rc6~22^2~4
X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=7d18aecd39180ac803e837ee0508a3bc12b168f3;p=~emulex%2Finfiniband.git

Merge branches 'acpica', 'acpi-tpm' and 'acpi-processor'

* acpica:
  ACPICA: Tables: Restore old behavor to favor 32-bit FADT addresses.
  ACPICA: Tables: Fix invalid pointer accesses in acpi_tb_parse_root_table().

* acpi-tpm:
  ACPI / TPM: Fix resume regression on Chromebooks

* acpi-processor:
  ACPI / processor: do not mark present at boot but not onlined CPU as onlined
---

7d18aecd39180ac803e837ee0508a3bc12b168f3