Merge branches 'cpuidle', 'fixes' and 'misc' into for-linus