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 /include/sound/emu10k1.h | |
| parent | 2c62e8492ed7358bbe7da51666c7e0f6da9474ee (diff) | |
| parent | 3349fb64b2927407017d970dd5c4daf3c5ad69f8 (diff) | |
| parent | a00212e21928640486d3cc939cf4d908e8522016 (diff) | |
| parent | 622532bb2fad8fe342fb685727ae0be566f6be5d (diff) | |
| download | linux-9a5d9315e41cc0dfc97a3b0a8e222d30566cf3fe.tar.bz2 | |
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