Conflicts:
	qemu/Makefile
	qemu/Makefile.target
	qemu/configure
	qemu/hw/pc.c
	qemu/hw/pc.h
	qemu/hw/pci.c
	qemu/hw/virtio-net.c
	qemu/net.c
	qemu/net.h
	qemu/pc-bios/bios.bin
	qemu/pc-bios/vgabios-cirrus.bin
	qemu/pc-bios/vgabios.bin
	qemu/target-ppc/helper.c
	qemu/vl.c

Signed-off-by: Avi Kivity <avi@redhat.com>