Pull bugzilla-7570 into release branch

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

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

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