From: Ingo Molnar <mingo@elte.hu>
Date: Wed, 25 Jun 2008 10:26:59 +0000 (+0200)
Subject: Merge branch 'linus' into sched/devel
X-Git-Tag: v2.6.27-rc1~1105^2~42
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=f57aec5a871907427060196f6bac3d0011b38450;p=linux-2.6-omap-h63xx.git

Merge branch 'linus' into sched/devel

Conflicts:

	kernel/sched_rt.c

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

f57aec5a871907427060196f6bac3d0011b38450