From: Ingo Molnar <mingo@elte.hu>
Date: Wed, 16 Dec 2009 17:33:49 +0000 (+0100)
Subject: Merge branch 'linus' into sched/urgent
X-Git-Tag: v2.6.33-rc2~48^2~19
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ee1156c11a1121e118b0a7f2dec240f0d421b1fd;p=pandora-kernel.git

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>
---

ee1156c11a1121e118b0a7f2dec240f0d421b1fd
Reading git-diff-tree failed