Merge branches 'acpi-init', 'acpi-pnp', 'acpi-scan', 'acpi-proc' and 'acpi-doc'
authorRafael J. Wysocki <rafael.j.wysocki@intel.com>
Thu, 18 Jun 2015 23:15:49 +0000 (01:15 +0200)
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>
Thu, 18 Jun 2015 23:15:49 +0000 (01:15 +0200)
commit3a5cf05adf90af5a40db22de5e8d22c8b3864a8c
tree3a96ac1e499f180c1a653a5446037cbd09889268
parent9695a9805284f09fefb5f8c53ba72d0c77748dbe
parentb064a8fa77dfead647564c46ac8fc5b13bd1ab73
parent0f1b414d190724617eb1cdd615592fa8cd9d0b50
parent0519ade71852701ec76ee7f8a0b37fe5a5504f98
parentbbf55ae19f55cc0ec0d75cfcfa3553331177b518
parent1a147ed75cc94cb2eca3bfa5ca00e069574090fd
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
Documentation/kernel-parameters.txt
include/linux/acpi.h