Merge branch 'x86/urgent' into x86/core
authorIngo Molnar <mingo@elte.hu>
Thu, 26 Feb 2009 05:30:42 +0000 (06:30 +0100)
committerIngo Molnar <mingo@elte.hu>
Thu, 26 Feb 2009 05:30:42 +0000 (06:30 +0100)
commit13b2eda64d14d0a0c15c092664c7351ea58ea851
treee0c82eb79a20f515f37ab3ffb9e5039b531eaa8c
parenta852cbfaaf8122827602027b1614971cfd832304
parent55d8085671863fe4ee6a17b7814bd38180a44e1d
Merge branch 'x86/urgent' into x86/core

Conflicts:
arch/x86/mach-voyager/voyager_smp.c
arch/x86/xen/enlighten.c