]> www.infradead.org Git - users/jedix/linux-maple.git/commitdiff
projects / users / jedix / linux-maple.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 514b25d bab858b 6306f04 b7a732a be7ae56)
Merge branches 'acpi-dptf', 'acpi-ec', 'acpi-apei' and 'acpi-misc' into linux-next
authorRafael J. Wysocki <rafael.j.wysocki@intel.com>
Mon, 31 May 2021 11:55:55 +0000 (13:55 +0200)
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>
Mon, 31 May 2021 11:55:55 +0000 (13:55 +0200)
* acpi-dptf:
  ACPI: DPTF: Add new PCH FIVR methods
  ACPI: DPTF: Add battery participant for Intel SoCs

* acpi-ec:
  ACPI: EC: Make more Asus laptops use ECDT _GPE

* acpi-apei:
  ACPI: APEI: Don't warn if ACPI is disabled

* acpi-misc:
  ACPI: configfs: Replace ACPI_INFO() with pr_debug()
  ACPI: ipmi: Remove address space handler in error path
  ACPI: event: Remove redundant initialization of local variable
  ACPI: sbshc: Fix fall-through warning for Clang


Trivial merge
Unnamed repository; edit this file 'description' to name the repository.