From: Ingo Molnar Date: Sun, 2 Aug 2009 12:11:26 +0000 (+0200) Subject: Merge branch 'sched/urgent' into sched/core X-Git-Tag: v2.6.32-rc1~719^2~40 X-Git-Url: http://git.samba.org/samba.git/?p=sfrench%2Fcifs-2.6.git;a=commitdiff_plain;h=8e9ed8b02490fea577b1eb1704c05bf43c891ed7 Merge branch 'sched/urgent' into sched/core Merge reason: avoid upcoming patch conflict. Signed-off-by: Ingo Molnar --- 8e9ed8b02490fea577b1eb1704c05bf43c891ed7