← Back to branch summary

~vcs-imports/qemu/maemo

~vcs-imports/qemu/maemo

Viewing all changes in revision 6450.1.5.

Committer: Riku Voipio
Date: 2009-06-08 15:31:58 UTC
mfrom: (6281.2.366)
mto: This revision was merged to the branch mainline in revision 6452.
Revision ID: git-v1:759b334a9739814df2883aa4c41b1c0f5670e90a

Merge commit 'gnu/master' into test

Epic merge

Conflicts:
        Makefile
        block.c
        block.h
        configure
        hw/boards.h
        hw/flash.h
        hw/integratorcp.c
        hw/nand.c
        hw/omap2.c
        hw/omap_i2c.c
        hw/sd.c
        hw/smc91c111.c
        hw/tsc2005.c
        hw/tusb6010.c
        hw/usb-musb.c
        linux-user/syscall.c
        target-arm/machine.c
        target-arm/translate.c

files added:
Makefile.hw

block

block/bochs.c

block/cloop.c

block/cow.c

block/curl.c

block/dmg.c

block/nbd.c

block/parallels.c

block/qcow.c

block/qcow2.c

block/raw-posix.c

block/raw-win32.c

block/vmdk.c

block/vpc.c

block/vvfat.c

cpu-common.h

hw/cris_pic_cpu.c

hw/microblaze_pic_cpu.c

hw/mips-bios.h

hw/petalogix_s3adsp1800_mmu.c

hw/poison.h

hw/qdev.c

hw/qdev.h

hw/ssi.c

hw/ssi.h

hw/syborg.c

hw/syborg.h

hw/syborg_fb.c

hw/syborg_interrupt.c

hw/syborg_keyboard.c

hw/syborg_pointer.c

hw/syborg_rtc.c

hw/syborg_serial.c

hw/syborg_timer.c

hw/syborg_virtio.c

hw/sysbus.c

hw/sysbus.h

hw/virtio-pci.c

hw/xilinx.h

hw/xilinx_ethlite.c

hw/xilinx_intc.c

hw/xilinx_timer.c

hw/xilinx_uartlite.c

linux-user/microblaze

linux-user/microblaze/syscall.h

linux-user/microblaze/syscall_nr.h

linux-user/microblaze/target_signal.h

linux-user/microblaze/termbits.h

microblaze-dis.c

module.c

module.h

pc-bios/bios-pq/0015_enable-power-button-even-generation.patch

pc-bios/bios-pq/0016-use-correct-mask-to-size-pci-option-rom-bar.patch

pc-bios/keymaps

pc-bios/keymaps/ar

pc-bios/keymaps/common

pc-bios/keymaps/da

pc-bios/keymaps/de

pc-bios/keymaps/de-ch

pc-bios/keymaps/en-gb

pc-bios/keymaps/en-us

pc-bios/keymaps/es

pc-bios/keymaps/et

pc-bios/keymaps/fi

pc-bios/keymaps/fo

pc-bios/keymaps/fr

pc-bios/keymaps/fr-be

pc-bios/keymaps/fr-ca

pc-bios/keymaps/fr-ch

pc-bios/keymaps/hr

pc-bios/keymaps/hu

pc-bios/keymaps/is

pc-bios/keymaps/it

pc-bios/keymaps/ja

pc-bios/keymaps/lt

pc-bios/keymaps/lv

pc-bios/keymaps/mk

pc-bios/keymaps/modifiers

pc-bios/keymaps/nl

pc-bios/keymaps/nl-be

pc-bios/keymaps/no

pc-bios/keymaps/pl

pc-bios/keymaps/pt

pc-bios/keymaps/pt-br

pc-bios/keymaps/ru

pc-bios/keymaps/sl

pc-bios/keymaps/sv

pc-bios/keymaps/th

pc-bios/keymaps/tr

pc-bios/petalogix-s3adsp1800.dtb

qemu-img-cmds.hx

qemu-monitor.hx

qemu-option.c

qemu-option.h

target-microblaze

target-microblaze/cpu.h

target-microblaze/exec.h

target-microblaze/helper.c

target-microblaze/helper.h

target-microblaze/machine.c

target-microblaze/microblaze-decode.h

target-microblaze/mmu.c

target-microblaze/mmu.h

target-microblaze/op_helper.c

target-microblaze/translate.c

targphys.h

tool-osdep.c

files removed:
block-bochs.c

block-cloop.c

block-cow.c

block-dmg.c

block-nbd.c

block-parallels.c

block-qcow.c

block-qcow2.c

block-raw-posix.c

block-raw-win32.c

block-vmdk.c

block-vpc.c

block-vvfat.c

keymaps

keymaps/ar

keymaps/common

keymaps/da

keymaps/de

keymaps/de-ch

keymaps/en-gb

keymaps/en-us

keymaps/es

keymaps/et

keymaps/fi

keymaps/fo

keymaps/fr

keymaps/fr-be

keymaps/fr-ca

keymaps/fr-ch

keymaps/hr

keymaps/hu

keymaps/is

keymaps/it

keymaps/ja

keymaps/lt

keymaps/lv

keymaps/mk

keymaps/modifiers

keymaps/nl

keymaps/nl-be

keymaps/no

keymaps/pl

keymaps/pt

keymaps/pt-br

keymaps/ru

keymaps/sl

keymaps/sv

keymaps/th

keymaps/tr

files modified:
.gitignore

MAINTAINERS

Makefile

Makefile.target

aes.c

aio.c

audio/audio.c

audio/audio.h

audio/audio_int.h

audio/audio_template.h

audio/wavcapture.c

block.c

block.h

block_int.h

buffered_file.c

configure

console.h

cpu-all.h

cpu-defs.h

cpu-exec.c

cutils.c

darwin-user/main.c

darwin-user/syscall.c

device_tree.c

dis-asm.h

disas.c

dma-helpers.c

dma.h

elf.h

elf_ops.h

exec.c

gdbstub.c

hw/ac97.c

hw/acpi.c

hw/adb.c

hw/adlib.c

hw/ads7846.c

hw/an5206.c

hw/apb_pci.c

hw/apic.c

hw/arm-misc.h

hw/arm_boot.c

hw/arm_gic.c

hw/arm_pic.c

hw/arm_sysctl.c

hw/arm_timer.c

hw/armv7m.c

hw/armv7m_nvic.c

hw/audiodev.h

hw/axis_dev88.c

hw/baum.c

hw/beagle.c

hw/blizzard.c

hw/boards.h

hw/cbus.c

hw/cirrus_vga.c

hw/cirrus_vga_rop.h

hw/cirrus_vga_rop2.h

hw/cs4231.c

hw/cs4231a.c

hw/cuda.c

hw/devices.h

hw/dma.c

hw/dp8393x.c

hw/dummy_m68k.c

hw/e1000.c

hw/ecc.c

hw/eccmemctl.c

hw/eepro100.c

hw/eeprom93xx.c

hw/es1370.c

hw/escc.c

hw/esp.c

hw/etraxfs.c

hw/etraxfs.h

hw/etraxfs_dma.c

hw/etraxfs_eth.c

hw/etraxfs_pic.c

hw/etraxfs_ser.c

hw/etraxfs_timer.c

hw/fdc.c

hw/flash.h

hw/framebuffer.c

hw/fw_cfg.c

hw/g364fb.c

hw/grackle_pci.c

hw/gt64xxx.c

hw/gumstix.c

hw/gus.c

hw/heathrow_pic.c

hw/hpet.c

hw/hw.h

hw/i2c.c

hw/i2c.h

hw/i8254.c

hw/i8259.c

hw/ide.c

hw/integratorcp.c

hw/ioapic.c

hw/iommu.c

hw/lm832x.c

hw/lsi53c895a.c

hw/m48t59.c

hw/mac_dbdma.c

hw/mac_nvram.c

hw/mainstone.c

hw/mainstone.h

hw/max111x.c

hw/max7310.c

hw/mcf5206.c

hw/mcf5208.c

hw/mcf_fec.c

hw/mcf_intc.c

hw/mips.h

hw/mips_jazz.c

hw/mips_malta.c

hw/mips_mipssim.c

hw/mips_r4k.c

hw/mpcore.c

hw/mst_fpga.c

hw/musicpal.c

hw/nand.c

hw/ne2000.c

hw/nseries.c

hw/omap.h

hw/omap1.c

hw/omap2.c

hw/omap3_mmc.c

hw/omap3_usb.c

hw/omap_clk.c

hw/omap_dss.c

hw/omap_i2c.c

hw/omap_mmc.c

hw/omap_sx1.c

hw/onenand.c

hw/openpic.c

hw/palm.c

hw/parallel.c

hw/pc.c

hw/pc.h

hw/pci-hotplug.c

hw/pci.c

hw/pci.h

hw/pci_host.h

hw/pckbd.c

hw/pcmcia.h

hw/pcnet.c

hw/pcspk.c

hw/pflash_cfi01.c

hw/pflash_cfi02.c

hw/piix_pci.c

hw/pl011.c

hw/pl022.c

hw/pl031.c

hw/pl050.c

hw/pl061.c

hw/pl080.c

hw/pl110.c

hw/pl181.c

hw/pl190.c

hw/ppc405_boards.c

hw/ppc405_uc.c

hw/ppc440_bamboo.c

hw/ppc4xx_devs.c

hw/ppc4xx_pci.c

hw/ppc_mac.h

hw/ppc_newworld.c

hw/ppc_oldworld.c

hw/ppc_prep.c

hw/ppce500_mpc8544ds.c

hw/ppce500_pci.c

hw/prep_pci.c

hw/primecell.h

hw/ps2.c

hw/pxa.h

hw/pxa2xx.c

hw/pxa2xx_dma.c

hw/pxa2xx_gpio.c

hw/pxa2xx_keypad.c

hw/pxa2xx_lcd.c

hw/pxa2xx_mmci.c

hw/pxa2xx_pcmcia.c

hw/pxa2xx_pic.c

hw/pxa2xx_timer.c

hw/r2d.c

hw/rc4030.c

hw/realview.c

hw/realview_gic.c

hw/rtl8139.c

hw/sb16.c

hw/sbi.c

hw/scsi-disk.c

hw/scsi-generic.c

hw/scsi.h

hw/sd.c

hw/sd.h

hw/serial.c

hw/sh7750.c

hw/sh_intc.c

hw/sh_intc.h

hw/sh_pci.c

hw/sh_serial.c

hw/sh_timer.c

hw/sharpsl.h

hw/shix.c

hw/slavio_intctl.c

hw/slavio_misc.c

hw/slavio_timer.c

hw/sm501.c

hw/smbus.c

hw/smbus.h

hw/smbus_eeprom.c

hw/smc91c111.c

hw/sparc32_dma.c

hw/spitz.c

hw/ssd0303.c

hw/ssd0323.c

hw/ssi-sd.c

hw/stellaris.c

hw/stellaris_enet.c

hw/sun4c_intctl.c

hw/sun4m.c

hw/sun4m.h

hw/sun4u.c

hw/tc58128.c

hw/tc6393xb.c

hw/tc6393xb_template.h

hw/tcx.c

hw/tmp105.c

hw/tosa.c

hw/tsc2005.c

hw/tsc210x.c

hw/tusb6010.c

hw/twl4030.c

hw/twl92230.c

hw/unin_pci.c

hw/usb-msd.c

hw/usb-musb.c

hw/usb-ohci.c

hw/usb-serial.c

hw/usb.h

hw/versatile_pci.c

hw/versatilepb.c

hw/vga.c

hw/vga_int.h

hw/virtio-balloon.c

hw/virtio-balloon.h

hw/virtio-blk.c

hw/virtio-blk.h

hw/virtio-console.c

hw/virtio-console.h

hw/virtio-net.c

hw/virtio-net.h

hw/virtio.c

hw/virtio.h

hw/vmware_vga.c

hw/wm8750.c

hw/xen_backend.c

hw/xen_machine_pv.c

hw/xen_nic.c

hw/zaurus.c

keymaps.c

kvm-all.c

kvm.h

linux-user/elfload.c

linux-user/flatload.c

linux-user/main.c

linux-user/ppc/syscall.h

linux-user/qemu.h

linux-user/signal.c

linux-user/syscall.c

linux-user/syscall_defs.h

migration-exec.c

migration-tcp.c

migration.c

monitor.c

nbd.c

net.c

net.h

osdep.c

pc-bios/bios-pq/series

pc-bios/bios.bin

posix-aio-compat.c

qemu-char.c

qemu-common.h

qemu-doc.texi

qemu-img.c

qemu-img.texi

qemu-io.c

qemu-malloc.c

qemu-sockets.c

qemu-tech.texi

rules.mak

savevm.c

sdl.c

slirp/bootp.c

slirp/libslirp.h

slirp/slirp.c

sysemu.h

target-arm/machine.c

target-arm/neon_helper.c

target-arm/translate.c

target-cris/cpu.h

target-cris/machine.c

target-cris/op_helper.c

target-cris/translate.c

target-i386/cpu.h

target-i386/helper.c

target-i386/helper.h

target-i386/kvm.c

target-i386/machine.c

target-i386/op_helper.c

target-i386/ops_sse.h

target-i386/translate.c

target-m68k/cpu.h

target-m68k/helper.c

target-m68k/machine.c

target-m68k/translate.c

target-mips/helper.c

target-mips/machine.c

target-mips/mips-defs.h

target-mips/translate.c

target-ppc/cpu.h

target-ppc/helper.c

target-ppc/machine.c

target-ppc/op_helper.c

target-ppc/translate.c

target-ppc/translate_init.c

target-sh4/helper.c

target-sh4/machine.c

target-sh4/translate.c

target-sparc/cpu.h

target-sparc/helper.c

target-sparc/helper.h

target-sparc/machine.c

target-sparc/op_helper.c

target-sparc/translate.c

tcg/tcg.c

tests/linux-test.c

usb-linux.c

vl.c

vnc.c

Show diffs side-by-side

added added

removed removed

Makefile.target

audio/audio_int.h

audio/audio_template.h

audio/wavcapture.c

block-parallels.c

block-raw-posix.c

block-raw-win32.c

block/parallels.c

block/raw-posix.c

block/raw-win32.c

buffered_file.c

darwin-user/main.c

darwin-user/syscall.c

hw/arm_sysctl.c

hw/armv7m_nvic.c

hw/axis_dev88.c

hw/cirrus_vga.c

hw/cirrus_vga_rop.h

hw/cirrus_vga_rop2.h

hw/cris_pic_cpu.c

hw/dummy_m68k.c

hw/eeprom93xx.c

hw/etraxfs_dma.c

hw/etraxfs_eth.c

hw/etraxfs_pic.c

hw/etraxfs_ser.c

hw/etraxfs_timer.c

hw/framebuffer.c

hw/grackle_pci.c

hw/heathrow_pic.c

hw/integratorcp.c

hw/lsi53c895a.c

hw/microblaze_pic_cpu.c

hw/mips_malta.c

hw/mips_mipssim.c

hw/pci-hotplug.c

hw/petalogix_s3adsp1800_mmu.c

hw/pflash_cfi01.c

hw/pflash_cfi02.c

hw/ppc405_boards.c

hw/ppc440_bamboo.c

hw/ppc4xx_devs.c

hw/ppc4xx_pci.c

hw/ppc_newworld.c

hw/ppc_oldworld.c

hw/ppce500_mpc8544ds.c

hw/ppce500_pci.c

hw/pxa2xx_dma.c

hw/pxa2xx_gpio.c

hw/pxa2xx_keypad.c

hw/pxa2xx_lcd.c

hw/pxa2xx_mmci.c

hw/pxa2xx_pcmcia.c

hw/pxa2xx_pic.c

hw/pxa2xx_timer.c

hw/realview_gic.c

hw/scsi-generic.c

hw/slavio_intctl.c

hw/slavio_misc.c

hw/slavio_timer.c

hw/smbus_eeprom.c

hw/sparc32_dma.c

hw/stellaris_enet.c

hw/sun4c_intctl.c

hw/syborg_interrupt.c

hw/syborg_keyboard.c

hw/syborg_pointer.c

hw/syborg_rtc.c

hw/syborg_serial.c

hw/syborg_timer.c

hw/syborg_virtio.c

hw/tc6393xb_template.h

hw/usb-serial.c

hw/versatile_pci.c

hw/versatilepb.c

hw/virtio-balloon.c

hw/virtio-balloon.h

hw/virtio-blk.c

hw/virtio-blk.h

hw/virtio-console.c

hw/virtio-console.h

hw/virtio-net.c

hw/virtio-net.h

hw/virtio-pci.c

hw/vmware_vga.c

hw/xen_backend.c

hw/xen_machine_pv.c

hw/xilinx_ethlite.c

hw/xilinx_intc.c

hw/xilinx_timer.c

hw/xilinx_uartlite.c

keymaps/modifiers

linux-user/elfload.c

linux-user/flatload.c

linux-user/main.c

linux-user/microblaze/

linux-user/microblaze/syscall.h

linux-user/microblaze/syscall_nr.h

linux-user/microblaze/target_signal.h

linux-user/microblaze/termbits.h

linux-user/ppc/syscall.h

linux-user/qemu.h

linux-user/signal.c

linux-user/syscall.c

linux-user/syscall_defs.h

microblaze-dis.c

migration-exec.c

migration-tcp.c

pc-bios/bios-pq/0015_enable-power-button-even-generation.patch

pc-bios/bios-pq/0016-use-correct-mask-to-size-pci-option-rom-bar.patch

pc-bios/bios-pq/series

pc-bios/bios.bin

pc-bios/keymaps/

pc-bios/keymaps/ar

pc-bios/keymaps/common

pc-bios/keymaps/da

pc-bios/keymaps/de

pc-bios/keymaps/de-ch

pc-bios/keymaps/en-gb

pc-bios/keymaps/en-us

pc-bios/keymaps/es

pc-bios/keymaps/et

pc-bios/keymaps/fi

pc-bios/keymaps/fo

pc-bios/keymaps/fr

pc-bios/keymaps/fr-be

pc-bios/keymaps/fr-ca

pc-bios/keymaps/fr-ch

pc-bios/keymaps/hr

pc-bios/keymaps/hu

pc-bios/keymaps/is

pc-bios/keymaps/it

pc-bios/keymaps/ja

pc-bios/keymaps/lt

pc-bios/keymaps/lv

pc-bios/keymaps/mk

pc-bios/keymaps/modifiers

pc-bios/keymaps/nl

pc-bios/keymaps/nl-be

pc-bios/keymaps/no

pc-bios/keymaps/pl

pc-bios/keymaps/pt

pc-bios/keymaps/pt-br

pc-bios/keymaps/ru

pc-bios/keymaps/sl

pc-bios/keymaps/sv

pc-bios/keymaps/th

pc-bios/keymaps/tr

pc-bios/petalogix-s3adsp1800.dtb

posix-aio-compat.c

qemu-img-cmds.hx

qemu-monitor.hx

slirp/libslirp.h

target-arm/machine.c

target-arm/neon_helper.c

target-arm/translate.c

target-cris/cpu.h

target-cris/machine.c

target-cris/op_helper.c

target-cris/translate.c

target-i386/cpu.h

target-i386/helper.c

target-i386/helper.h

target-i386/kvm.c

target-i386/machine.c

target-i386/op_helper.c

target-i386/ops_sse.h

target-i386/translate.c

target-m68k/cpu.h

target-m68k/helper.c

target-m68k/machine.c

target-m68k/translate.c

target-microblaze/

target-microblaze/cpu.h

target-microblaze/exec.h

target-microblaze/helper.c

target-microblaze/helper.h

target-microblaze/machine.c

target-microblaze/microblaze-decode.h

target-microblaze/mmu.c

target-microblaze/mmu.h

target-microblaze/op_helper.c

target-microblaze/translate.c

target-mips/helper.c

target-mips/machine.c

target-mips/mips-defs.h

target-mips/translate.c

target-ppc/cpu.h

target-ppc/helper.c

target-ppc/machine.c

target-ppc/op_helper.c

target-ppc/translate.c

target-ppc/translate_init.c

target-sh4/helper.c

target-sh4/machine.c

target-sh4/translate.c

target-sparc/cpu.h

target-sparc/helper.c

target-sparc/helper.h

target-sparc/machine.c

target-sparc/op_helper.c

target-sparc/translate.c

tests/linux-test.c

Older »