diff options
| author | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2015-11-20 00:22:52 (GMT) |
|---|---|---|
| committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2015-11-20 00:22:52 (GMT) |
| commit | a3767e3c9da514e63e898772b72b932f9eb3b062 (patch) | |
| tree | 0c3fa0e701f95857be38185619625a8d723e3777 | |
| parent | 0aba0ab8915bcad3ae7e05e18bc2c5c55570e328 (diff) | |
| parent | a76032e0abef027df83f7f053580aa297de54818 (diff) | |
| parent | 4981c2b7abfe92a7ad3c9888b8a1ada552d49406 (diff) | |
| parent | 768acd64d68b232e0d2b9623d9846457355f0c27 (diff) | |
| download | linux-a3767e3c9da514e63e898772b72b932f9eb3b062.tar.xz | |
Merge branches 'acpi-smbus', 'acpi-ec' and 'acpi-pci'
* acpi-smbus:
Revert "ACPI / SBS: Add 5 us delay to fix SBS hangs on MacBook"
ACPI / SMBus: Fix boot stalls / high CPU caused by reentrant code
* acpi-ec:
ACPI-EC: Drop unnecessary check made before calling acpi_ec_delete_query()
* acpi-pci:
PCI: Fix OF logic in pci_dma_configure()