summary refs log tree commit diff
path: root/drivers/platform
diff options
context:
space:
mode:
authorRafael J. Wysocki <rafael.j.wysocki@intel.com>2021-02-15 17:04:04 +0100
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>2021-02-15 17:04:04 +0100
commit8af4d3784489e3330f8ef4c15e85d1d646701b78 (patch)
tree15c20389de8d7f386584596fa43dab9107d6e867 /drivers/platform
parent938bdd1d7dad75299201d1cc47c1dcf4d49f9274 (diff)
parent4fca9de24753e0eeac276f2915c1d52c553d609e (diff)
parent1de359d82576e57963f0d8b2d89cbdb2c9f4f2aa (diff)
parent041142d7d25294c17d39552ae51c1d8d89434010 (diff)
downloadlinux-8af4d3784489e3330f8ef4c15e85d1d646701b78.tar.gz
Merge branches 'acpi-scan', 'acpi-properties' and 'acpi-platform'
* acpi-scan:
  ACPI: scan: Rearrange code related to acpi_get_device_data()
  ACPI: scan: Adjust white space in acpi_device_add()
  ACPI: scan: Rearrange memory allocation in acpi_device_add()

* acpi-properties:
  ACPI: property: Satisfy kernel doc validator (part 2)
  ACPI: property: Satisfy kernel doc validator (part 1)
  ACPI: property: Make acpi_node_prop_read() static
  ACPI: property: Remove dead code
  ACPI: property: Fix fwnode string properties matching

* acpi-platform:
  ACPI: platform-profile: Fix possible deadlock in platform_profile_remove()
  ACPI: platform-profile: Introduce object pointers to callbacks
  ACPI: platform-profile: Drop const qualifier for cur_profile
  ACPI: platform: Add platform profile support
  Documentation: Add documentation for new platform_profile sysfs attribute