Merge branches 'acpica', 'acpi-tpm' and 'acpi-processor'
authorRafael J. Wysocki <rafael.j.wysocki@intel.com>
Thu, 15 May 2014 12:07:32 +0000 (14:07 +0200)
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>
Thu, 15 May 2014 12:07:32 +0000 (14:07 +0200)
commit7d18aecd39180ac803e837ee0508a3bc12b168f3
tree00560d14d24e487049aa889fe72acef23eedf3c4
parent85dbd5801f62b66e2aa7826aaefcaebead44c8a6
parentf759546498d820670934c901a2fdf1ce948d2e5c
parent0b9d46dd7debf8e6dc8614106f1c1909fa8de64d
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