From: Ingo Molnar <mingo@elte.hu>
Date: Sun, 25 Oct 2009 16:30:53 +0000 (+0100)
Subject: Merge branch 'linus' into sched/core
X-Git-Tag: v2.6.33-rc1~398^2~31
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0b9e31e9264f1bad89856afb96da1688292f13b4;p=pandora-kernel.git

Merge branch 'linus' into sched/core

Conflicts:
	fs/proc/array.c

Merge reason: resolve conflict and queue up dependent patch.

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

0b9e31e9264f1bad89856afb96da1688292f13b4
Reading git-diff-tree failed