Public Git Hosting - qemu/ar7.git/commit

summary | log | graphiclog1 | graphiclog2 | commit | commitdiff | tree | refs | edit | fork
(merge: 9a3aaa3 8f970ef)

commit	3ca21eeba997e6126b236e9f31d0d85c9144880c
author	Stefan Weil <sw@weilnetz.de>
	Thu, 22 Jan 2015 20:53:49 +0000 (22 21:53 +0100)
committer	Stefan Weil <sw@weilnetz.de>
	Thu, 22 Jan 2015 20:53:49 +0000 (22 21:53 +0100)
tree	8292855d21c33c5c355a41476a77f425909338af	tree \| snapshot (tar.gz zip)
parent	9a3aaa32e54ed90427ce73601b9d5c5e46791cf1	commit \| diff
parent	8f970eff6e318524f189f105c236e47633759890	commit \| diff

Merge remote-tracking branch 'qemu/master'

Conflicts:
include/qemu/sockets.h

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

25 files changed:

configure	diff1 \|	diff2 \|	blob \| history
docs/xbzrle.txt	diff1 \|	diff2 \|	blob \| history
exec.c	diff1 \|	diff2 \|	blob \| history
hw/display/vga.c	diff1 \|	diff2 \|	blob \| history
include/exec/cpu-all.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/vm86.c	diff1 \|	diff2 \|	blob \| history
monitor.c	diff1 \|	diff2 \|	blob \| history
qemu-options.hx	diff1 \|	diff2 \|	blob \| history
target-arm/cpu.h	diff1 \|	diff2 \|	blob \| history
target-cris/cpu.h	diff1 \|	diff2 \|	blob \| history
target-i386/cpu.h	diff1 \|	diff2 \|	blob \| history
target-i386/seg_helper.c	diff1 \|	diff2 \|	blob \| history
target-mips/cpu.h	diff1 \|	diff2 \|	blob \| history
target-mips/op_helper.c	diff1 \|	diff2 \|	blob \| history
target-sparc/translate.c	diff1 \|	diff2 \|	blob \| history
trace-events	diff1 \|	diff2 \|	blob \| history
translate-all.c	diff1 \|	diff2 \|	blob \| history
ui/console.c	diff1 \|	diff2 \|	blob \| history
ui/gtk.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