Ingo Molnar c931aaf0e1 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>		2009-09-01 12:13:30 +02:00
..
asm	Merge branch 'x86/paravirt' into x86/cpu	2009-09-01 12:13:30 +02:00