Merge branches 'acpi', 'idle', 'mrst-pmu' and 'pm-tools' into next