Conflicts:
	kernel/sched_idletask.c

Merge reason: resolve the conflicts, pick up latest changes.
Signed-off-by: Ingo Molnar <mingo@elte.hu>