From: Ingo Molnar Date: Thu, 26 Feb 2009 05:30:42 +0000 (+0100) Subject: Merge branch 'x86/urgent' into x86/core X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=13b2eda64d14d0a0c15c092664c7351ea58ea851;p=linux-beck.git Merge branch 'x86/urgent' into x86/core Conflicts: arch/x86/mach-voyager/voyager_smp.c --- 13b2eda64d14d0a0c15c092664c7351ea58ea851