projects / GitHub / LineageOS / G12 / android_kernel_amlogic_linux-4.9.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: b12745c edc345d 76c599b 9d128ed cd7f84c)
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)
* 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

1  2  3  4  5 
drivers/acpi/bus.c patch | diff1 | diff2 | diff3 | diff4 | diff5 | blob | history
drivers/acpi/osl.c patch | diff1 | diff2 | diff3 | diff4 | diff5 | blob | history
include/acpi/acpi_bus.h patch | diff1 | diff2 | diff3 | diff4 | diff5 | blob | history

diff --cc drivers/acpi/bus.c
Simple merge
diff --cc drivers/acpi/osl.c
Simple merge
diff --cc include/acpi/acpi_bus.h
Simple merge