tree b8771cc5a9758af9d7410fc519227c036c222130
parent b9f8fcd55bbdb037e5332dbdb7b494f0b70861ac
parent 8bea8672edfca7ec5f661cafb218f1205863b343
author Ingo Molnar <mingo@elte.hu> 1260984829 +0100
committer Ingo Molnar <mingo@elte.hu> 1260984829 +0100

Merge branch 'linus' into sched/urgent

Conflicts:
	kernel/sched_idletask.c

Merge reason: resolve the conflicts, pick up latest changes.

Signed-off-by: Ingo Molnar <mingo@elte.hu>