From: Ingo Molnar Date: Sat, 18 Jul 2009 13:50:22 +0000 (+0200) Subject: Merge branch 'linus' into sched/core X-Git-Tag: v2.6.32-rc1~719^2~50 X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5304d5fc74a269cc6c3e70f9713684ca729abdf0;p=pandora-kernel.git Merge branch 'linus' into sched/core Merge reason: branch had an old upstream base (-rc1-ish), but also merge to avoid a conflict. Signed-off-by: Ingo Molnar --- 5304d5fc74a269cc6c3e70f9713684ca729abdf0 Reading git-diff-tree failed