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>

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>
c931aaf0 · Ingo Molnar · ff55df53 · ac5672f8 · c931aaf0 · c931aaf0
Commit c931aaf0 authored Sep 01, 2009 by Ingo Molnar
Expand all Hide whitespace changes
Inline Side-by-side

Showing with 722 additions and 711 deletions

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

arch/x86/include/asm/paravirt_types.h arch/x86/include/asm/paravirt_types.h +721 -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