]> git.baikalelectronics.ru Git - kernel.git/commit
Merge branches 'acpi-scan', 'acpi-bus', 'acpi-osl' and 'acpi-pm'
authorRafael J. Wysocki <rafael.j.wysocki@intel.com>
Tue, 12 Jan 2016 00:10:03 +0000 (01:10 +0100)
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>
Tue, 12 Jan 2016 00:10:03 +0000 (01:10 +0100)
commit648747c9e1bf5daa1ad747896ba0ddd4cdd462f3
tree0c92f8d94a86f1660c2443c0b8b065591692094f
parent45a1dbe204a9e77d083efe5f10945267552810df
parentc11e6faaec2d37848ede5048020318346adf60e8
parent4889fad7e6a8196c82305840dde7b0dedcaea39e
parent3091354c7f945056933fc8f0f5aca7b6d82e817c
parent1ef8a526606e6cfbd05b719e85bb286f53b2b92b
Merge branches 'acpi-scan', 'acpi-bus', 'acpi-osl' and 'acpi-pm'

* acpi-scan:
  ACPI: Fix white space in a structure definition
  ACPI / utils: Add acpi_dev_present()
  ACPI / scan: Fix acpi_bus_id_list bookkeeping
  ACPI / scan: set status to 0 if _STA failed

* acpi-bus:
  ACPI / bus: Show _OSC UUID when _OSC fails
  ACPI / bus: Tidy up _OSC error spacing

* acpi-osl:
  ACPI / OSL: Add kerneldoc comments to memory mapping functions

* acpi-pm:
  ACPI / PM: Support D3 COLD device in old BIOS for ZPODD
drivers/acpi/bus.c
drivers/acpi/osl.c
include/acpi/acpi_bus.h