diff options
author | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2015-09-01 04:41:19 +0300 |
---|---|---|
committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2015-09-01 04:41:19 +0300 |
commit | 5d2a1a927d487d6bb60c87b837d82702d8ebcaad (patch) | |
tree | 96ed7f74d1a23794bf4c4218355467c2c69a2a35 /drivers/acpi/acpica/hwxfsleep.c | |
parent | ef5f5de069bd9081a7ddf6998269b58fc65e27ef (diff) | |
parent | 5d0ddfebb93069061880fc57ee4ba7246bd1e1ee (diff) | |
parent | b00855aecbb166428c67b26e1bfeb675463a0212 (diff) | |
parent | 02b771b64b73226052d6e731a0987db3b47281e9 (diff) | |
parent | 3277b4ea216e5cd7d3f6095ff40f1a9e574f37b3 (diff) | |
download | linux-5d2a1a927d487d6bb60c87b837d82702d8ebcaad.tar.xz |
Merge branches 'acpi-pci', 'acpi-soc', 'acpi-ec' and 'acpi-osl'
* acpi-pci:
ACPI, PCI: Penalize legacy IRQ used by ACPI SCI
* acpi-soc:
ACPI / LPSS: Ignore 10ms delay for Braswell
* acpi-ec:
ACPI / EC: Fix an issue caused by the serialized _Qxx evaluations
* acpi-osl:
ACPI / osl: replace custom implementation of readq / writeq