Public Git Hosting - qemu/ar7.git/commit

commit	f9c8bf6473bf09e96f2a3c7b8684c97e5f5270cd
author	Stefan Weil <sw@weilnetz.de>
	Tue, 12 Jan 2016 13:52:54 +0000 (12 14:52 +0100)
committer	Stefan Weil <sw@weilnetz.de>
	Tue, 12 Jan 2016 13:52:54 +0000 (12 14:52 +0100)
tree	84a9c8cb6d6130c934654ee3c3b139761bc46f94	tree \| snapshot (tar.gz zip)
parent	97465a998dc89b4fd13dbbf6c4a2ed71568b029e	commit \| diff
parent	cf57c2f18b4fc7d9207d5321be18ddab214965bb	commit \| diff

Merge remote-tracking branch 'qemu/master'

Conflicts:
configure
hw/mips/gt64xxx_pci.c
linux-user/main.c
target-arm/op_helper.c
ui/vnc.c
ui/vnc.h

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

46 files changed:

MAINTAINERS	diff1 \|	diff2 \|	blob \| history
Makefile	diff1 \|	diff2 \|	blob \| history
Makefile.target	diff1 \|	diff2 \|	blob \| history
bsd-user/main.c	diff1 \|	diff2 \|	blob \| history
configure	diff1 \|	diff2 \|	blob \| history
cpus.c	diff1 \|	diff2 \|	blob \| history
disas/libvixl/vixl/a64/constants-a64.h	diff1 \|	diff2 \|	blob \| history
exec.c	diff1 \|	diff2 \|	blob \| history
hw/display/vga.c	diff1 \|	diff2 \|	blob \| history
hw/display/xenfb.c	diff1 \|	diff2 \|	blob \| history
hw/input/ps2.c	diff1 \|	diff2 \|	blob \| history
hw/mips/gt64xxx_pci.c	diff1 \|	diff2 \|	blob \| history
hw/misc/Makefile.objs	diff1 \|	diff2 \|	blob \| history
hw/ppc/spapr.c	diff1 \|	diff2 \|	blob \| history
include/block/block_int.h	diff1 \|	diff2 \|	blob \| history
include/qemu-common.h	diff1 \|	diff2 \|	blob \| history
include/qemu/sockets.h	diff1 \|	diff2 \|	blob \| history
linux-user/elfload.c	diff1 \|	diff2 \|	blob \| history
linux-user/main.c	diff1 \|	diff2 \|	blob \| history
linux-user/mmap.c	diff1 \|	diff2 \|	blob \| history
linux-user/signal.c	diff1 \|	diff2 \|	blob \| history
linux-user/syscall.c	diff1 \|	diff2 \|	blob \| history
memory.c	diff1 \|	diff2 \|	blob \| history
monitor.c	diff1 \|	diff2 \|	blob \| history
qemu-char.c	diff1 \|	diff2 \|	blob \| history
qemu-doc.texi	diff1 \|	diff2 \|	blob \| history
qemu-img.c	diff1 \|	diff2 \|	blob \| history
qemu-options.hx	diff1 \|	diff2 \|	blob \| history
target-arm/op_helper.c	diff1 \|	diff2 \|	blob \| history
target-arm/translate.c	diff1 \|	diff2 \|	blob \| history
target-cris/op_helper.c	diff1 \|	diff2 \|	blob \| history
target-cris/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
target-microblaze/mmu.c	diff1 \|	diff2 \|	blob \| history
target-microblaze/op_helper.c	diff1 \|	diff2 \|	blob \| history
target-ppc/excp_helper.c	diff1 \|	diff2 \|	blob \| history
target-ppc/translate.c	diff1 \|	diff2 \|	blob \| history
target-sparc/translate.c	diff1 \|	diff2 \|	blob \| history
tests/ahci-test.c	diff1 \|	diff2 \|	blob \| history
tests/test-qmp-input-visitor.c	diff1 \|	diff2 \|	blob \| history
ui/console.c	diff1 \|	diff2 \|	blob \| history
ui/vnc.c	diff1 \|	diff2 \|	blob \| history
ui/vnc.h	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
bsd-user/main.c	diff1 \|	diff2 \|	blob \| history
configure	diff1 \|	diff2 \|	blob \| history
cpus.c	diff1 \|	diff2 \|	blob \| history
disas/libvixl/vixl/a64/constants-a64.h	diff1 \|	diff2 \|	blob \| history
exec.c	diff1 \|	diff2 \|	blob \| history
hw/display/vga.c	diff1 \|	diff2 \|	blob \| history
hw/display/xenfb.c	diff1 \|	diff2 \|	blob \| history
hw/input/ps2.c	diff1 \|	diff2 \|	blob \| history
hw/mips/gt64xxx_pci.c	diff1 \|	diff2 \|	blob \| history
hw/misc/Makefile.objs	diff1 \|	diff2 \|	blob \| history
hw/ppc/spapr.c	diff1 \|	diff2 \|	blob \| history
include/block/block_int.h	diff1 \|	diff2 \|	blob \| history
include/qemu-common.h	diff1 \|	diff2 \|	blob \| history
include/qemu/sockets.h	diff1 \|	diff2 \|	blob \| history
linux-user/elfload.c	diff1 \|	diff2 \|	blob \| history
linux-user/main.c	diff1 \|	diff2 \|	blob \| history
linux-user/mmap.c	diff1 \|	diff2 \|	blob \| history
linux-user/signal.c	diff1 \|	diff2 \|	blob \| history
linux-user/syscall.c	diff1 \|	diff2 \|	blob \| history
memory.c	diff1 \|	diff2 \|	blob \| history
monitor.c	diff1 \|	diff2 \|	blob \| history
qemu-char.c	diff1 \|	diff2 \|	blob \| history
qemu-doc.texi	diff1 \|	diff2 \|	blob \| history
qemu-img.c	diff1 \|	diff2 \|	blob \| history
qemu-options.hx	diff1 \|	diff2 \|	blob \| history
target-arm/op_helper.c	diff1 \|	diff2 \|	blob \| history
target-arm/translate.c	diff1 \|	diff2 \|	blob \| history
target-cris/op_helper.c	diff1 \|	diff2 \|	blob \| history
target-cris/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
target-microblaze/mmu.c	diff1 \|	diff2 \|	blob \| history
target-microblaze/op_helper.c	diff1 \|	diff2 \|	blob \| history
target-ppc/excp_helper.c	diff1 \|	diff2 \|	blob \| history
target-ppc/translate.c	diff1 \|	diff2 \|	blob \| history
target-sparc/translate.c	diff1 \|	diff2 \|	blob \| history
tests/ahci-test.c	diff1 \|	diff2 \|	blob \| history
tests/test-qmp-input-visitor.c	diff1 \|	diff2 \|	blob \| history
ui/console.c	diff1 \|	diff2 \|	blob \| history
ui/vnc.c	diff1 \|	diff2 \|	blob \| history
ui/vnc.h	diff1 \|	diff2 \|	blob \| history
vl.c	diff1 \|	diff2 \|	blob \| history