diff options
| author | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2019-12-25 15:11:24 +0100 |
|---|---|---|
| committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2019-12-25 15:11:24 +0100 |
| commit | 2d3e79725873c20f6b27e6aecd13e1a4fa5c93a3 (patch) | |
| tree | 26a0bb5b73871c7f65a4aa032884ac42e97b2c8d | |
| parent | 51cf929321ed4184a819b9246253602dbfed5dcf (diff) | |
| parent | 0435bcd9e185803402a2566e78c1067c615bc579 (diff) | |
| parent | 1985f8c7f9a42a651a9750d6fcadc74336d182df (diff) | |
Merge branches 'acpi-doc' and 'acpi-tools' into linux-next
* acpi-doc:
docs: firmware-guide: ACPI: Replace dma_request_slave_channel() with dma_request_chan()
* acpi-tools:
tools/power/acpi: fix compilation error