diff options
| author |   Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2014-05-15 14:07:32 +0200 |
|---|---|---|
| committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2014-05-15 14:07:32 +0200 |
| commit | 7d18aecd39180ac803e837ee0508a3bc12b168f3 (patch) | |
| tree | 00560d14d24e487049aa889fe72acef23eedf3c4 /include/linux/timerqueue.h | |
| parent | ACPICA: Tables: Restore old behavor to favor 32-bit FADT addresses. (diff) | |
| parent | ACPI / TPM: Fix resume regression on Chromebooks (diff) | |
| parent | ACPI / processor: do not mark present at boot but not onlined CPU as onlined (diff) | |
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