Public Git Hosting - qemu/ar7.git/commit

summary | log | graphiclog1 | graphiclog2 | commit | commitdiff | tree | refs | edit | fork
(merge: e75113e 5d32173)

commit	9e795215fd0a13f0b83f2332c8231b7067e8a72a
author	Stefan Weil <sw@weilnetz.de>
	Tue, 19 Jul 2016 18:13:23 +0000 (19 20:13 +0200)
committer	Stefan Weil <sw@weilnetz.de>
	Tue, 19 Jul 2016 18:13:23 +0000 (19 20:13 +0200)
tree	29a7ad58c6db434c8064443a8987da4207f0f774	tree \| snapshot (tar.gz zip)
parent	e75113e03359ad0b6d00775bc49ea5c96ccd751e	commit \| diff
parent	5d3217340adcb6c4f0e4af5d2b865331eb2ff63d	commit \| diff

Merge remote-tracking branch 'qemu/master'

Conflicts:
cpu-exec.c

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

18 files changed:

MAINTAINERS	diff1 \|	diff2 \|	blob \| history
block/raw-win32.c	diff1 \|	diff2 \|	blob \| history
bsd-user/main.c	diff1 \|	diff2 \|	blob \| history
bsd-user/qemu.h	diff1 \|	diff2 \|	blob \| history
exec.c	diff1 \|	diff2 \|	blob \| history
hw/scsi/megasas.c	diff1 \|	diff2 \|	blob \| history
include/block/block_int.h	diff1 \|	diff2 \|	blob \| history
include/qom/cpu.h	diff1 \|	diff2 \|	blob \| history
linux-user/main.c	diff1 \|	diff2 \|	blob \| history
monitor.c	diff1 \|	diff2 \|	blob \| history
target-i386/cpu.h	diff1 \|	diff2 \|	blob \| history
target-i386/translate.c	diff1 \|	diff2 \|	blob \| history
target-ppc/translate_init.c	diff1 \|	diff2 \|	blob \| history
tcg/tcg.h	diff1 \|	diff2 \|	blob \| history
tests/ahci-test.c	diff1 \|	diff2 \|	blob \| history
tests/ide-test.c	diff1 \|	diff2 \|	blob \| history
ui/vnc.c	diff1 \|	diff2 \|	blob \| history
vl.c	diff1 \|	diff2 \|	blob \| history

AR7 emulation for QEMU