tree af24d9ca22803b60d3f8dc7c5614dadb25169aa1
parent 4b54d2e10c8cbe9e855750740d48ce7bb721c60c
parent a98ea727a3aa63dc9cb9d8a94864bd21b3b9b91f
author Rafael J. Wysocki <rafael.j.wysocki@intel.com> 1785264652 +0200
committer Rafael J. Wysocki <rafael.j.wysocki@intel.com> 1785264652 +0200

Merge branch 'test/acpi-driver' into testing

* test/acpi-driver:
  PCI: acpiphp_ibm: Do not use uninitialized device_class
  x86/platform/olpc: xo15: Stop setting acpi_device_name/class()
  sonypi: Stop setting acpi_device_name/class()
  platform/surface: surfacepro3_button: Stop setting acpi_device_name()
  hwmon: (acpi_power_meter) Stop setting acpi_device_name/class()
  platform/x86: topstar-laptop: Stop setting acpi_device_name/class()
  platform/x86: xo15-ebook: Stop setting acpi_device_name/class()
  platform/x86: toshiba_haps: Do not use uninitialized device_class
  platform/x86: toshiba_acpi: Do not use uninitialized device_class
  platform/x86: sony-laptop: Stop setting acpi_device_class()
  platform/x86: panasonic-laptop: Stop setting acpi_device_name/class()
  platform/x86: thinkpad_acpi: Stop setting acpi_device_class()
  platform/x86: fujitsu-tablet: Stop setting acpi_device_name/class()
  platform/x86: fujitsu-laptop: Stop setting acpi_device_name/class()
  platform/x86: eeepc-laptop: Stop setting acpi_device_name/class()
  platform/x86: asus-laptop: Stop setting acpi_device_name/class()
  watchdog: ni903x_wdt: Check ACPI_COMPANION() against NULL