Sync for kernel/cpu/idle.c from 3.12.y

Conflicts:
	kernel/cpu/idle.c