]> git.baikalelectronics.ru Git - kernel.git/commit
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)
commitf1a06a4d9430cbbcd2625f3d328b8519f3d6dc0b
tree3a96ac1e499f180c1a653a5446037cbd09889268
parent9074b50abd5c375fc9332f60758028dd4b7b69ef
parent06f4b9bbb700e6cef14db7aab91e6322c1d0a9d9
parentcfd3a227bb6934d49bea145d8b69d45276a28196
parent8c6123bda20c0d368c387296b0295630d6ca0b0e
parenta3faab5a4732d74730c950e30a2871688f62b661
parenta7b001e560b180ddf93dde9feec56a5ae003b7c8
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