summaryrefslogtreecommitdiffstats
path: root/arch
diff options
context:
space:
mode:
authorRafael J. Wysocki <rafael.j.wysocki@intel.com>2020-04-10 11:31:43 +0200
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>2020-04-10 11:31:43 +0200
commit0214da7cce2030f1a71fb555e2967faf3b92aebf (patch)
tree0ff7fe915cec4160a0e8be29f311b528e4dfd1b6 /arch
parent6de084803074dcead5da5bf5c82d189b4cf4b6b5 (diff)
parentd7e0481c0d0f0d2e73d4f1e675cb89d0308d0f7c (diff)
parentb5432a699fdff9266a475771bd46d740f40f76aa (diff)
downloadlinux-0214da7cce2030f1a71fb555e2967faf3b92aebf.tar.bz2
Merge branches 'acpi-ec' and 'acpi-x86'
* acpi-ec: ACPI: EC: Fix up fast path check in acpi_ec_add() * acpi-x86: ACPI, x86/boot: make acpi_nobgrt static