diff options
| author | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2016-11-18 21:34:42 +0100 |
|---|---|---|
| committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2016-11-18 21:34:42 +0100 |
| commit | aab0b243b9a2fab7dcee0ce6e13789d3ab0394bf (patch) | |
| tree | 67c7b1981a48e4c46b73d38151abf49f5ded901c /include/acpi | |
| parent | e2174b0c24caca170ca61eda2ae49c9561ff8896 (diff) | |
| parent | 6ca595a70bc46e1a0eea3ee0681360f41555bfd9 (diff) | |
| parent | d5a4b1a540b8a9a44888b383472a80b84765aaa0 (diff) | |
| download | linux-aab0b243b9a2fab7dcee0ce6e13789d3ab0394bf.tar.bz2 | |
Merge branches 'acpica-fixes', 'acpi-cppc-fixes' and 'acpi-tools-fixes'
* acpica-fixes:
Revert "ACPICA: FADT support cleanup"
* acpi-cppc-fixes:
mailbox: PCC: Fix lockdep warning when request PCC channel
* acpi-tools-fixes:
tools/power/acpi: Remove direct kernel source include reference