Merge branches 'release', 'cpuidle-2.6.25' and 'idle' into release