diff options
author | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2017-07-27 23:14:08 +0200 |
---|---|---|
committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2017-07-27 23:14:08 +0200 |
commit | f6248dd88dba3aeb19351410a027d92eee7ceb72 (patch) | |
tree | 9dfe33ca030186ffd5007784d0647a8306d41be9 /Documentation/siphash.txt | |
parent | 880a66275ef4d1e08e5d4dcf4cec768de18c68ef (diff) | |
parent | 02cb489be7ad07e74ab40baa908d2e20460ebdb2 (diff) | |
download | linux-f6248dd88dba3aeb19351410a027d92eee7ceb72.tar.gz |
Merge branches 'acpi-pm' and 'acpi-numa'
* acpi-pm: ACPI / PM / EC: Flush all EC work in acpi_freeze_sync() ACPI / EC: Add parameter to force disable the GPE on suspend * acpi-numa: ACPI: NUMA: Fix typo in the full name of SRAT ACPI: NUMA: add missing include in acpi_numa.h
Diffstat (limited to 'Documentation/siphash.txt')
0 files changed, 0 insertions, 0 deletions