Merge branch 'qemu-vendor-drops' (qemu as of 2007-10-01)

Merge branch 'qemu-vendor-drops' (qemu as of 2007-10-01)

Conflicts:

	kernel/Kbuild
	kernel/Makefile
	qemu/.cvsignore
	qemu/Changelog
	qemu/Makefile
	qemu/Makefile.target
	qemu/arm-semi.c
	qemu/audio/audio.c
	qemu/audio/audio_template.h
	qemu/audio/coreaudio.c
	qemu/audio/wavaudio.c
	qemu/audio/wavcapture.c
	qemu/block-bochs.c
	qemu/block-cow.c
	qemu/block-qcow.c
	qemu/block-qcow2.c
	qemu/block-raw.c
	qemu/block-vmdk.c
	qemu/block-vpc.c
	qemu/block-vvfat.c
	qemu/block.c
	qemu/block_int.h
	qemu/configure
	qemu/console.c
	qemu/cpu-all.h
	qemu/cpu-defs.h
	qemu/cpu-exec.c
	qemu/cutils.c
	qemu/darwin-user/main.c
	qemu/darwin-user/mmap.c
	qemu/darwin-user/syscall.c
	qemu/darwin-user/syscalls.h
	qemu/dyngen-exec.h
	qemu/dyngen.c
	qemu/dyngen.h
	qemu/elf.h
	qemu/exec-all.h
	qemu/exec.c
	qemu/fpu/softfloat-native.c
	qemu/fpu/softfloat.h
	qemu/gdbstub.c
	qemu/gdbstub.h
	qemu/hw/acpi.c
	qemu/hw/apb_pci.c
	qemu/hw/apic.c
	qemu/hw/arm_boot.c
	qemu/hw/arm_gic.c
	qemu/hw/arm_sysctl.c
	qemu/hw/arm_timer.c
	qemu/hw/cdrom.c
	qemu/hw/cirrus_vga.c
	qemu/hw/cs4231.c
	qemu/hw/cuda.c
	qemu/hw/esp.c
	qemu/hw/fdc.c
	qemu/hw/grackle_pci.c
	qemu/hw/gt64xxx.c
	qemu/hw/i8254.c
	qemu/hw/i8259.c
	qemu/hw/ide.c
	qemu/hw/integratorcp.c
	qemu/hw/iommu.c
	qemu/hw/isa_mmio.c
	qemu/hw/lsi53c895a.c
	qemu/hw/m48t59.c
	qemu/hw/mc146818rtc.c
	qemu/hw/mips_int.c
	qemu/hw/mips_malta.c
	qemu/hw/mips_r4k.c
	qemu/hw/mips_timer.c
	qemu/hw/ne2000.c
	qemu/hw/pc.c
	qemu/hw/pci.c
	qemu/hw/pci_host.h
	qemu/hw/pcnet.c
	qemu/hw/pflash_cfi02.c
	qemu/hw/piix_pci.c
	qemu/hw/pl011.c
	qemu/hw/pl050.c
	qemu/hw/pl080.c
	qemu/hw/ppc.c
	qemu/hw/ppc_chrp.c
	qemu/hw/ppc_prep.c
	qemu/hw/prep_pci.c
	qemu/hw/realview.c
	qemu/hw/rtl8139.c
	qemu/hw/scsi-disk.c
	qemu/hw/sh7750.c
	qemu/hw/slavio_serial.c
	qemu/hw/slavio_timer.c
	qemu/hw/smbus.h
	qemu/hw/smbus_eeprom.c
	qemu/hw/sparc32_dma.c
	qemu/hw/sun4m.c
	qemu/hw/sun4u.c
	qemu/hw/tcx.c
	qemu/hw/unin_pci.c
	qemu/hw/usb-hid.c
	qemu/hw/usb-hub.c
	qemu/hw/usb-msd.c
	qemu/hw/usb-ohci.c
	qemu/hw/usb-uhci.c
	qemu/hw/usb.h
	qemu/hw/versatile_pci.c
	qemu/hw/versatilepb.c
	qemu/hw/vga.c
	qemu/hw/vga_int.h
	qemu/hw/vga_template.h
	qemu/kqemu.c
	qemu/linux-user/arm/syscall_nr.h
	qemu/linux-user/elfload.c
	qemu/linux-user/flat.h
	qemu/linux-user/flatload.c
	qemu/linux-user/linuxload.c
	qemu/linux-user/m68k-sim.c
	qemu/linux-user/m68k/syscall_nr.h
	qemu/linux-user/m68k/termbits.h
	qemu/linux-user/main.c
	qemu/linux-user/mmap.c
	qemu/linux-user/qemu.h
	qemu/linux-user/signal.c
	qemu/linux-user/syscall.c
	qemu/linux-user/syscall_defs.h
	qemu/monitor.c
	qemu/osdep.c
	qemu/osdep.h
	qemu/pc-bios/README
	qemu/pc-bios/bios.bin
	qemu/pc-bios/bios.diff
	qemu/pc-bios/openbios-sparc32
	qemu/pc-bios/vgabios-cirrus.bin
	qemu/pc-bios/vgabios.bin
	qemu/ppc.ld
	qemu/qemu-doc.texi
	qemu/qemu-img.c
	qemu/sdl.c
	qemu/slirp/tcp_subr.c
	qemu/slirp/udp.c
	qemu/target-arm/cpu.h
	qemu/target-arm/helper.c
	qemu/target-arm/translate.c
	qemu/target-i386/cpu.h
	qemu/target-i386/exec.h
	qemu/target-i386/helper.c
	qemu/target-i386/helper2.c
	qemu/target-i386/translate.c
	qemu/target-m68k/cpu.h
	qemu/target-m68k/exec.h
	qemu/target-m68k/helper.c
	qemu/target-m68k/op-hacks.h
	qemu/target-m68k/op.c
	qemu/target-m68k/qregs.def
	qemu/target-m68k/translate.c
	qemu/target-mips/TODO
	qemu/target-mips/cpu.h
	qemu/target-mips/exec.h
	qemu/target-mips/fop_template.c
	qemu/target-mips/helper.c
	qemu/target-mips/mips-defs.h
	qemu/target-mips/op.c
	qemu/target-mips/op_helper.c
	qemu/target-mips/op_helper_mem.c
	qemu/target-mips/op_mem.c
	qemu/target-mips/op_template.c
	qemu/target-mips/translate.c
	qemu/target-ppc/cpu.h
	qemu/target-ppc/helper.c
	qemu/target-ppc/op.c
	qemu/target-ppc/translate.c
	qemu/target-ppc/translate_init.c
	qemu/target-sh4/cpu.h
	qemu/target-sh4/helper.c
	qemu/target-sh4/op.c
	qemu/target-sh4/translate.c
	qemu/target-sparc/cpu.h
	qemu/target-sparc/exec.h
	qemu/target-sparc/helper.c
	qemu/target-sparc/op.c
	qemu/target-sparc/op_helper.c
	qemu/target-sparc/translate.c
	qemu/tests/Makefile
	qemu/usb-linux.c
	qemu/vl.c
	qemu/vl.h
	qemu/vnc.c
	qemu/vnchextile.h
	user/Makefile