From: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Date: Fri, 10 Apr 2020 09:31:43 +0000 (+0200)
Subject: Merge branches 'acpi-ec' and 'acpi-x86'
X-Git-Tag: v5.10.7~2830^2
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=0214da7cce2030f1a71fb555e2967faf3b92aebf;p=platform%2Fkernel%2Flinux-rpi.git

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
---

0214da7cce2030f1a71fb555e2967faf3b92aebf