Merge branch 'acpi-tables'

author Rafael J. Wysocki <[email protected]>

Thu, 25 Feb 2021 17:57:40 +0000 (18:57 +0100)

committer Rafael J. Wysocki <[email protected]>

Thu, 25 Feb 2021 17:57:40 +0000 (18:57 +0100)
author Rafael J. Wysocki <[email protected]>
Thu, 25 Feb 2021 17:57:40 +0000 (18:57 +0100)
committer Rafael J. Wysocki <[email protected]>
Thu, 25 Feb 2021 17:57:40 +0000 (18:57 +0100)
diff --cc drivers/acpi/Kconfig
Simple merge
diff --cc drivers/acpi/Makefile
Simple merge
author	Rafael J. Wysocki <[email protected]>
	Thu, 25 Feb 2021 17:57:40 +0000 (18:57 +0100)
committer	Rafael J. Wysocki <[email protected]>
	Thu, 25 Feb 2021 17:57:40 +0000 (18:57 +0100)
		1	2
drivers/acpi/Kconfig	patch \|	diff1 \|	diff2 \|	blob \| history
drivers/acpi/Makefile	patch \|	diff1 \|	diff2 \|	blob \| history