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 | |
| parent | 9695a9805284f09fefb5f8c53ba72d0c77748dbe (diff) | |
| parent | b064a8fa77dfead647564c46ac8fc5b13bd1ab73 (diff) | |
| parent | 0f1b414d190724617eb1cdd615592fa8cd9d0b50 (diff) | |
| parent | 0519ade71852701ec76ee7f8a0b37fe5a5504f98 (diff) | |
| parent | bbf55ae19f55cc0ec0d75cfcfa3553331177b518 (diff) | |
| parent | 1a147ed75cc94cb2eca3bfa5ca00e069574090fd (diff) | |
| download | linux-3a5cf05adf90af5a40db22de5e8d22c8b3864a8c.tar.gz linux-3a5cf05adf90af5a40db22de5e8d22c8b3864a8c.tar.bz2 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