From: Ingo Molnar Date: Mon, 30 Mar 2009 21:53:32 +0000 (+0200) Subject: Merge branch 'linus' into cpumask-for-linus X-Git-Tag: v2.6.30-rc1~205^2^2 X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=65fb0d23fcddd8697c871047b700c78817bdaa43;p=pandora-kernel.git Merge branch 'linus' into cpumask-for-linus Conflicts: arch/x86/kernel/cpu/common.c --- 65fb0d23fcddd8697c871047b700c78817bdaa43 Reading git-diff-tree failed