From: Thomas Gleixner <tglx@linutronix.de>
Date: Tue, 16 Feb 2010 15:48:56 +0000 (+0100)
Subject: Merge branch 'sched/urgent' into sched/core
X-Git-Tag: v2.6.34-rc1~260^2~2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6e40f5bbbc734231bc5809d3eb785e3c21f275d7;p=pandora-kernel.git

Merge branch 'sched/urgent' into sched/core

Conflicts: kernel/sched.c

Necessary due to the urgent fixes which conflict with the code move
from sched.c to sched_fair.c

Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
---

6e40f5bbbc734231bc5809d3eb785e3c21f275d7
Reading git-diff-tree failed