diff options
| author | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2015-06-19 01:15:49 +0200 |
|---|---|---|
| committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2015-06-19 01:15:49 +0200 |
| commit | 3a5cf05adf90af5a40db22de5e8d22c8b3864a8c (patch) | |
| tree | 3a96ac1e499f180c1a653a5446037cbd09889268 /drivers/acpi/osl.c | |
| parent | Merge branch 'acpica' (diff) | |
| parent | ACPI / init: Switch over platform to the ACPI mode later (diff) | |
| parent | ACPI / PNP: Avoid conflicting resource reservations (diff) | |
| parent | ACPI / scan: constify ACPI device ids (diff) | |
| parent | ACPI / proc: make ACPI_PROCFS_POWER X86 only (diff) | |
| parent | ACPI: Constify ACPI device IDs in documentation (diff) | |
| download | linux-3a5cf05adf90af5a40db22de5e8d22c8b3864a8c.tar.xz linux-3a5cf05adf90af5a40db22de5e8d22c8b3864a8c.zip | |
Merge branches 'acpi-init', 'acpi-pnp', 'acpi-scan', 'acpi-proc' and 'acpi-doc'
* acpi-init:
ACPI / init: Switch over platform to the ACPI mode later
* acpi-pnp:
ACPI / PNP: Avoid conflicting resource reservations
* acpi-scan:
ACPI / scan: constify ACPI device ids
ACPI / property: Define a symbol for PRP0001
ACPI / property: Refine consistency check for PRP0001
* acpi-proc:
ACPI / proc: make ACPI_PROCFS_POWER X86 only
* acpi-doc:
ACPI: Constify ACPI device IDs in documentation
ACPI / enumeration: Document the rules regarding the PRP0001 device ID
ACPI: fix kernel-parameters ordering in Documentation