Public Git Hosting - qemu/ar7.git/commit

commit	34738355206af057e4739b79b5d1b43be5f45115
author	Stefan Weil <sw@weilnetz.de>
	Sat, 6 Jun 2015 17:36:27 +0000 (6 19:36 +0200)
committer	Stefan Weil <sw@weilnetz.de>
	Sat, 6 Jun 2015 17:36:27 +0000 (6 19:36 +0200)
tree	1f8713fe5bdfbe6131077e6e4b11410928d13e1f	tree \| snapshot (tar.gz zip)
parent	c2005900f6e52af7457433ba3c820a3d925ba374	commit \| diff
parent	3b730f570c5872ceea2137848f1d4554d4847441	commit \| diff

Merge remote-tracking branch 'qemu/master'

Conflicts:
Makefile
include/glib-compat.h
include/hw/boards.h
monitor.c
target-arm/cpu.h
target-arm/op_helper.c

Signed-off-by: Stefan Weil <sw@weilnetz.de>

39 files changed:

MAINTAINERS	diff1 \|	diff2 \|	blob \| history
Makefile	diff1 \|	diff2 \|	blob \| history
Makefile.target	diff1 \|	diff2 \|	blob \| history
configure	diff1 \|	diff2 \|	blob \| history
default-configs/arm-softmmu.mak	diff1 \|	diff2 \|	blob \| history
default-configs/mips-softmmu.mak	diff1 \|	diff2 \|	blob \| history
default-configs/mipsel-softmmu.mak	diff1 \|	diff2 \|	blob \| history
hw/arm/Makefile.objs	diff1 \|	diff2 \|	blob \| history
hw/arm/boot.c	diff1 \|	diff2 \|	blob \| history
hw/arm/s3c24xx_irq.c	diff1 \|	\|	blob \| history
hw/i386/acpi-build.c	diff1 \|	diff2 \|	blob \| history
hw/intc/Makefile.objs	diff1 \|	diff2 \|	blob \| history
hw/pci/pci.c	diff1 \|	diff2 \|	blob \| history
hw/ppc/prep.c	diff1 \|	diff2 \|	blob \| history
hw/ppc/spapr.c	diff1 \|	diff2 \|	blob \| history
hw/timer/arm_timer.c	diff1 \|	diff2 \|	blob \| history
include/block/block_int.h	diff1 \|	diff2 \|	blob \| history
include/hw/arm/arm.h	diff1 \|	diff2 \|	blob \| history
include/hw/boards.h	diff1 \|	diff2 \|	blob \| history
include/qemu-common.h	diff1 \|	diff2 \|	blob \| history
include/ui/gtk.h	diff1 \|	diff2 \|	blob \| history
linux-user/signal.c	diff1 \|	diff2 \|	blob \| history
monitor.c	diff1 \|	diff2 \|	blob \| history
net/tap-win32.c	diff1 \|	diff2 \|	blob \| history
qemu-img.c	diff1 \|	diff2 \|	blob \| history
qemu-io.c	diff1 \|	diff2 \|	blob \| history
qemu-options.hx	diff1 \|	diff2 \|	blob \| history
target-alpha/mem_helper.c	diff1 \|	diff2 \|	blob \| history
target-arm/cpu.c	diff1 \|	diff2 \|	blob \| history
target-arm/cpu.h	diff1 \|	diff2 \|	blob \| history
target-arm/helper.c	diff1 \|	diff2 \|	blob \| history
target-arm/op_helper.c	diff1 \|	diff2 \|	blob \| history
target-arm/translate.c	diff1 \|	diff2 \|	blob \| history
target-i386/cpu.c	diff1 \|	diff2 \|	blob \| history
target-i386/cpu.h	diff1 \|	diff2 \|	blob \| history
target-i386/kvm.c	diff1 \|	diff2 \|	blob \| history
tcg/tcg.h	diff1 \|	diff2 \|	blob \| history
util/oslib-win32.c	diff1 \|	diff2 \|	blob \| history
vl.c	diff1 \|	diff2 \|	blob \| history

AR7 emulation for QEMU

RSS Atom

MAINTAINERS	diff1 \|	diff2 \|	blob \| history
Makefile	diff1 \|	diff2 \|	blob \| history
Makefile.target	diff1 \|	diff2 \|	blob \| history
configure	diff1 \|	diff2 \|	blob \| history
default-configs/arm-softmmu.mak	diff1 \|	diff2 \|	blob \| history
default-configs/mips-softmmu.mak	diff1 \|	diff2 \|	blob \| history
default-configs/mipsel-softmmu.mak	diff1 \|	diff2 \|	blob \| history
hw/arm/Makefile.objs	diff1 \|	diff2 \|	blob \| history
hw/arm/boot.c	diff1 \|	diff2 \|	blob \| history
hw/arm/s3c24xx_irq.c	diff1 \|	\|	blob \| history
hw/i386/acpi-build.c	diff1 \|	diff2 \|	blob \| history
hw/intc/Makefile.objs	diff1 \|	diff2 \|	blob \| history
hw/pci/pci.c	diff1 \|	diff2 \|	blob \| history
hw/ppc/prep.c	diff1 \|	diff2 \|	blob \| history
hw/ppc/spapr.c	diff1 \|	diff2 \|	blob \| history
hw/timer/arm_timer.c	diff1 \|	diff2 \|	blob \| history
include/block/block_int.h	diff1 \|	diff2 \|	blob \| history
include/hw/arm/arm.h	diff1 \|	diff2 \|	blob \| history
include/hw/boards.h	diff1 \|	diff2 \|	blob \| history
include/qemu-common.h	diff1 \|	diff2 \|	blob \| history
include/ui/gtk.h	diff1 \|	diff2 \|	blob \| history
linux-user/signal.c	diff1 \|	diff2 \|	blob \| history
monitor.c	diff1 \|	diff2 \|	blob \| history
net/tap-win32.c	diff1 \|	diff2 \|	blob \| history
qemu-img.c	diff1 \|	diff2 \|	blob \| history
qemu-io.c	diff1 \|	diff2 \|	blob \| history
qemu-options.hx	diff1 \|	diff2 \|	blob \| history
target-alpha/mem_helper.c	diff1 \|	diff2 \|	blob \| history
target-arm/cpu.c	diff1 \|	diff2 \|	blob \| history
target-arm/cpu.h	diff1 \|	diff2 \|	blob \| history
target-arm/helper.c	diff1 \|	diff2 \|	blob \| history
target-arm/op_helper.c	diff1 \|	diff2 \|	blob \| history
target-arm/translate.c	diff1 \|	diff2 \|	blob \| history
target-i386/cpu.c	diff1 \|	diff2 \|	blob \| history
target-i386/cpu.h	diff1 \|	diff2 \|	blob \| history
target-i386/kvm.c	diff1 \|	diff2 \|	blob \| history
tcg/tcg.h	diff1 \|	diff2 \|	blob \| history
util/oslib-win32.c	diff1 \|	diff2 \|	blob \| history
vl.c	diff1 \|	diff2 \|	blob \| history