Merge branches 'acpi-video', 'device-properties', 'pm-sleep' and 'pm-cpuidle'