Merge back earlier ACPI backlight material for 3.19-rc1.