Merge branch 'x86/paravirt' into x86/cleanups

Reason: The setup cleanups conflict with the paravirt cleanups. Avoid a rather large merge conflict Signed-off-by: Thomas Gleixner <tglx@linutronix.de>

Merge branch 'x86/paravirt' into x86/cleanups
Reason: The setup cleanups conflict with the paravirt cleanups. Avoid a rather large merge conflict Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
6effcd92 · Thomas Gleixner · 10f02d11 · ac5672f8 · 6effcd92 · 6effcd92
Commit 6effcd92 authored Aug 27, 2009 by Thomas Gleixner
Expand all Show whitespace changes
Inline Side-by-side

Showing with 721 additions and 710 deletions

arch/x86/include/asm/paravirt.h arch/x86/include/asm/paravirt.h +1 -710

arch/x86/include/asm/paravirt_types.h arch/x86/include/asm/paravirt_types.h +720 -0

No files found.
--- a/arch/x86/include/asm/paravirt.h
+++ b/arch/x86/include/asm/paravirt.h
--- a/arch/x86/include/asm/paravirt_types.h
+++ b/arch/x86/include/asm/paravirt_types.h