Pull bugzilla-5000 into release branch

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

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

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

diff --cc include/acpi/acpi_bus.h
Simple merge