diff options
| author | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2014-05-15 16:07:32 +0400 |
|---|---|---|
| committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2014-05-15 16:07:32 +0400 |
| commit | 7d18aecd39180ac803e837ee0508a3bc12b168f3 (patch) | |
| tree | 00560d14d24e487049aa889fe72acef23eedf3c4 /mm/slub.c | |
| parent | 85dbd5801f62b66e2aa7826aaefcaebead44c8a6 (diff) | |
| parent | f759546498d820670934c901a2fdf1ce948d2e5c (diff) | |
| parent | 0b9d46dd7debf8e6dc8614106f1c1909fa8de64d (diff) | |
| download | linux-7d18aecd39180ac803e837ee0508a3bc12b168f3.tar.xz | |
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