diff options
| author | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2020-06-01 16:22:05 +0300 |
|---|---|---|
| committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2020-06-01 16:22:05 +0300 |
| commit | 48c604151a55629ea0a2c22c51a331a3360dbdbc (patch) | |
| tree | a40957af469ef78026d72a6f4c25953e5a62c675 /net/mptcp | |
| parent | 6e6c25283dff866308c87b49434c7dbad4774cc0 (diff) | |
| parent | 2d2feb6813171c6a0071148239845ee251a7d164 (diff) | |
| parent | 95722237cb2ae4f7b73471058cdb19e8f4057c93 (diff) | |
| download | linux-48c604151a55629ea0a2c22c51a331a3360dbdbc.tar.xz | |
Merge branches 'acpica' and 'acpi-tables'
* acpica:
ACPICA: Update version to 20200430
ACPICA: Fix required parameters for _NIG and _NIH
ACPICA: Dispatcher: add status checks
ACPICA: Disassembler: ignore AE_ALREADY_EXISTS status when parsing create operators
ACPICA: Move acpi_gbl_next_cmd_num definition to acglobal.h
ACPICA: Make acpi_protocol_lengths static
* acpi-tables:
ACPI: sleep: Put the FACS table after using it
ACPI: scan: Put SPCR and STAO table after using it
ACPI: EC: Put the ACPI table after using it
ACPI: APEI: Put the HEST table for error path
ACPI: APEI: Put the error record serialization table for error path
ACPI: APEI: Put the error injection table for error path and module exit
ACPI: APEI: Put the boot error record table after parsing
ACPI: watchdog: Put the watchdog action table after parsing
ACPI: LPIT: Put the low power idle table after using it