Ingo Molnar 453c1404c5 Merge branch 'x86/apic' into x86/x2apic ... Conflicts: arch/x86/kernel/paravirt.c arch/x86/kernel/smpboot.c arch/x86/kernel/vmi_32.c arch/x86/lguest/boot.c arch/x86/xen/enlighten.c include/asm-x86/apic.h include/asm-x86/paravirt.h Signed-off-by: Ingo Molnar <mingo@elte.hu>		2008-07-18 23:00:05 +02:00
..
enlighten.c	Merge branch 'x86/apic' into x86/x2apic	2008-07-18 23:00:05 +02:00
grant-table.c	xen: make grant table arch portable	2008-04-24 23:57:32 +02:00
Kconfig	Merge commit 'v2.6.26-rc8' into x86/xen	2008-06-25 12:16:51 +02:00
Makefile	xen: implement save/restore	2008-05-27 10:11:38 +02:00
mmu.c	Merge branch 'generic-ipi' into generic-ipi-for-linus	2008-07-15 21:55:59 +02:00
mmu.h	xen: implement ptep_modify_prot_start/commit	2008-06-25 15:17:23 +02:00
multicalls.c	xen: add mechanism to extend existing multicalls	2008-06-25 15:17:34 +02:00
multicalls.h	xen: add mechanism to extend existing multicalls	2008-06-25 15:17:34 +02:00
setup.c	xen: reserve ISA space in e820 map	2008-07-08 12:48:29 +02:00
smp.c	Merge branch 'generic-ipi' into generic-ipi-for-linus	2008-07-15 21:55:59 +02:00
suspend.c	xen: resume timers on all vcpus	2008-06-02 13:25:44 +02:00
time.c	x86: rename paravirtualized TSC functions	2008-07-09 07:43:28 +02:00
vdso.h	i386: move xen	2007-10-11 11:16:51 +02:00
xen-asm.S	xen: fold xen_sysexit into xen_iret	2008-04-24 23:57:33 +02:00
xen-head.S	xen: remove support for non-PAE 32-bit	2008-06-24 17:00:55 +02:00
xen-ops.h	Merge branch 'generic-ipi' into generic-ipi-for-linus	2008-07-15 21:55:59 +02:00