diff options
author | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2015-05-07 21:24:34 +0200 |
---|---|---|
committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2015-05-07 21:24:34 +0200 |
commit | 9a5d9315e41cc0dfc97a3b0a8e222d30566cf3fe (patch) | |
tree | 6525a13c82798ea034b6795d6c93d8b26e6d8f9f /net/bluetooth/a2mp.c | |
parent | x86/PCI/ACPI: Make all resources except [io 0xcf8-0xcff] available on PCI bus (diff) | |
parent | ACPI / SBS: Add 5 us delay to fix SBS hangs on MacBook (diff) | |
parent | ACPI / documentation: Fix ambiguity in the GPIO properties document (diff) | |
parent | ACPI / PNP: add two IDs to list for PNPACPI device enumeration (diff) | |
download | linux-9a5d9315e41cc0dfc97a3b0a8e222d30566cf3fe.tar.xz linux-9a5d9315e41cc0dfc97a3b0a8e222d30566cf3fe.zip |
Merge branches 'acpi-resources', 'acpi-battery', 'acpi-doc' and 'acpi-pnp'
* acpi-resources:
x86/PCI/ACPI: Make all resources except [io 0xcf8-0xcff] available on PCI bus
* acpi-battery:
ACPI / SBS: Add 5 us delay to fix SBS hangs on MacBook
* acpi-doc:
ACPI / documentation: Fix ambiguity in the GPIO properties document
ACPI / documentation: fix a sentence about GPIO resources
* acpi-pnp:
ACPI / PNP: add two IDs to list for PNPACPI device enumeration