Merge branch 'constify' into release

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

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

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

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

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