Public Git Hosting - qemu/ar7.git/commit

summary | log | graphiclog1 | graphiclog2 | commit | commitdiff | tree | refs | edit | fork
(merge: f1a7ea4 4c65fed)

commit	81c1f3b7ba939f941e33d5781ff4e0e04bda80af
author	Stefan Weil <sw@weilnetz.de>
	Fri, 4 Dec 2015 06:03:04 +0000 (4 07:03 +0100)
committer	Stefan Weil <sw@weilnetz.de>
	Fri, 4 Dec 2015 06:03:04 +0000 (4 07:03 +0100)
tree	39f76679855d22fa4e7a1f843f69317a6aa08f07	tree \| snapshot (tar.gz zip)
parent	f1a7ea43ad84ff9b7485c4583e7318f8c62736ec	commit \| diff
parent	4c65fed8bdf96780735dbdb92a8bd0d6b6526cc3	commit \| diff

Merge remote-tracking branch 'qemu/master'

Conflicts:
configure

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

exec.c	diff1 \|	diff2 \|	blob \| history
hw/ppc/ppc405_boards.c	diff1 \|	diff2 \|	blob \| history
hw/ppc/spapr.c	diff1 \|	diff2 \|	blob \| history
include/exec/cpu-all.h	diff1 \|	diff2 \|	blob \| history
linux-user/elfload.c	diff1 \|	diff2 \|	blob \| history
linux-user/mmap.c	diff1 \|	diff2 \|	blob \| history
qemu-char.c	diff1 \|	diff2 \|	blob \| history
tcg/tcg.c	diff1 \|	diff2 \|	blob \| history
translate-all.c	diff1 \|	diff2 \|	blob \| history
ui/vnc.c	diff1 \|	diff2 \|	blob \| history

AR7 emulation for QEMU