Merge "cpuidle: add support for states that affect multiple cpus"