Benjamin Herrenschmidt bcd6acd51f Merge commit 'origin/master' into next ...

Conflicts:
	include/linux/kvm.h

2009-12-09 17:14:38 +11:00

..

assigned-dev.c

…

coalesced_mmio.c

…

coalesced_mmio.h

…

eventfd.c

…

ioapic.c

…

ioapic.h

…

iodev.h

…

iommu.c

…

irq_comm.c

KVM: only clear irq_source_id if irqchip is present

2009-12-03 09:32:23 +02:00

Kconfig

…

kvm_main.c

Merge commit 'origin/master' into next

2009-12-09 17:14:38 +11:00