From: Ingo Molnar <mingo@elte.hu>
Date: Mon, 9 Feb 2009 11:16:59 +0000 (+0100)
Subject: Merge branch 'x86/paravirt' into x86/apic
X-Git-Tag: v2.6.30-rc1~211^2~26^2~2^2~17
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=eca217b36e5d7d4377493d5cedd89105e66a5a72;p=pandora-kernel.git

Merge branch 'x86/paravirt' into x86/apic

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

eca217b36e5d7d4377493d5cedd89105e66a5a72
Reading git-diff-tree failed