Merge back earlier 'acpi-assorted' material

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

diff --cc drivers/acpi/internal.h
Simple merge

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

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

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

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

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