From: Ingo Molnar <mingo@elte.hu>
Date: Tue, 1 Sep 2009 10:13:30 +0000 (+0200)
Subject: Merge branch 'x86/paravirt' into x86/cpu
X-Git-Tag: v2.6.32-rc1~711^2~10
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c931aaf0e1b11862077f6884b2cec22833080e23;p=pandora-kernel.git

Merge branch 'x86/paravirt' into x86/cpu

Conflicts:
	arch/x86/include/asm/paravirt.h

Manual merge:
	arch/x86/include/asm/paravirt_types.h

Merge reason: x86/paravirt conflicts non-trivially with x86/cpu,
              resolve it.

Signed-off-by: Ingo Molnar <mingo@elte.hu>
---

c931aaf0e1b11862077f6884b2cec22833080e23
Reading git-diff-tree failed