From: Ingo Molnar <mingo@elte.hu>
Date: Thu, 5 Aug 2010 07:46:29 +0000 (+0200)
Subject: Merge branch 'sched/urgent' into sched/core
X-Git-Tag: v2.6.36-rc1~531^2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0bcfe75807944106a3aa655a54bb610d62f3a7f5;p=pandora-kernel.git

Merge branch 'sched/urgent' into sched/core

Conflicts:
	include/linux/sched.h

Merge reason: Add the leftover .35 urgent bits, fix the conflict.

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

0bcfe75807944106a3aa655a54bb610d62f3a7f5
Reading git-diff-tree failed