1
linux/virt/kvm
Ingo Molnar 1a781a777b Merge branch 'generic-ipi' into generic-ipi-for-linus
Conflicts:

	arch/powerpc/Kconfig
	arch/s390/kernel/time.c
	arch/x86/kernel/apic_32.c
	arch/x86/kernel/cpu/perfctr-watchdog.c
	arch/x86/kernel/i8259_64.c
	arch/x86/kernel/ldt.c
	arch/x86/kernel/nmi_64.c
	arch/x86/kernel/smpboot.c
	arch/x86/xen/smp.c
	include/asm-x86/hw_irq_32.h
	include/asm-x86/hw_irq_64.h
	include/asm-x86/mach-default/irq_vectors.h
	include/asm-x86/mach-voyager/irq_vectors.h
	include/asm-x86/smp.h
	kernel/Makefile

Signed-off-by: Ingo Molnar <mingo@elte.hu>
2008-07-15 21:55:59 +02:00
..
ioapic.c KVM: IOAPIC: Fix level-triggered irq injection hang 2008-07-06 11:05:35 +03:00
ioapic.h KVM: Move ioapic code to common directory. 2008-01-30 18:01:19 +02:00
iodev.h
kvm_main.c on_each_cpu(): kill unused 'retry' parameter 2008-06-26 11:24:38 +02:00
kvm_trace.c KVM: Rename debugfs_dir to kvm_debugfs_dir 2008-04-27 18:21:36 +03:00