From: Ingo Molnar Date: Wed, 21 Jul 2010 19:45:02 +0000 (+0200) Subject: Merge branch 'linus' into sched/core X-Git-Tag: v2.6.36-rc1~531^2~2 X-Git-Url: http://bbs.cooldavid.org/git/?a=commitdiff_plain;h=dca45ad8af54963c005393a484ad117b8ba6150f;p=net-next-2.6.git Merge branch 'linus' into sched/core Merge reason: Move from the -rc3 to the almost-rc6 base. Signed-off-by: Ingo Molnar --- dca45ad8af54963c005393a484ad117b8ba6150f