From: Ingo Molnar Date: Thu, 19 Jun 2008 07:09:15 +0000 (+0200) Subject: Merge branch 'sched' into sched-devel X-Git-Tag: v2.6.27-rc1~1105^2~49 X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=1cdad71537b42d0f0bf247772942ce678e4e8898;p=pandora-kernel.git Merge branch 'sched' into sched-devel Conflicts: kernel/sched_rt.c Signed-off-by: Ingo Molnar --- 1cdad71537b42d0f0bf247772942ce678e4e8898 Reading git-diff-tree failed