Pull bugfix into test branch

diff --cc drivers/acpi/Kconfig
Simple merge

diff --cc drivers/acpi/osl.c
Simple merge

diff --cc drivers/acpi/pci_root.c
Simple merge

diff --cc drivers/acpi/processor_core.c
Simple merge