Public Git Hosting - qemu/ar7.git/commit

summary | log | graphiclog1 | graphiclog2 | commit | commitdiff | tree | refs | edit | fork
(merge: d3964a7 d2aa90c)

commit	9ac86a9342352490c1853b1b6680409e6b2381e0
author	Stefan Weil <sw@weilnetz.de>
	Sat, 7 Dec 2013 16:13:02 +0000 (7 17:13 +0100)
committer	Stefan Weil <sw@weilnetz.de>
	Sat, 7 Dec 2013 16:13:02 +0000 (7 17:13 +0100)
tree	6efd894c2a6f07d2fa5fd2f64ea83c4810c4df2e	tree \| snapshot (tar.gz zip)
parent	d3964a798ce458fa165eb2ad72518f6896a02b71	commit \| diff
parent	d2aa90cda81ae3f860dd047ce5e37e0473452d54	commit \| diff

Merge remote-tracking branch 'qemu/master'

Conflicts:
exec.c

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

12 files changed:

block.c	diff1 \|	diff2 \|	blob \| history
block/vhdx.c	diff1 \|	diff2 \|	blob \| history
exec.c	diff1 \|	diff2 \|	blob \| history
include/block/block_int.h	diff1 \|	diff2 \|	blob \| history
qemu-img-cmds.hx	diff1 \|	diff2 \|	blob \| history
qemu-img.c	diff1 \|	diff2 \|	blob \| history
qemu-options.hx	diff1 \|	diff2 \|	blob \| history
target-i386/cpu.c	diff1 \|	diff2 \|	blob \| history
tests/qemu-iotests/common.rc	diff1 \|	diff2 \|	blob \| history
tests/test-aio.c	diff1 \|	diff2 \|	blob \| history
trace-events	diff1 \|	diff2 \|	blob \| history
vl.c	diff1 \|	diff2 \|	blob \| history

AR7 emulation for QEMU