Public Git Hosting - qemu/ar7.git/commit

summary | log | graphiclog1 | graphiclog2 | commit | commitdiff | tree | refs | edit | fork
(merge: 508e038 55ac0a9)

commit	30f3dda24b2a4cd30f8fbf984ab08ef08eaf5020
author	Paolo Bonzini <pbonzini@redhat.com>
	Fri, 3 Mar 2017 15:39:18 +0000 (3 16:39 +0100)
committer	Paolo Bonzini <pbonzini@redhat.com>
	Fri, 3 Mar 2017 15:39:18 +0000 (3 16:39 +0100)
tree	5d70d2f93f28b4935c68b48482cdba5302b410ba	tree \| snapshot (tar.gz zip)
parent	508e038a5d725f2aa729f58a1f5209b9be4227de	commit \| diff
parent	55ac0a9bf4e1b1adfc7d73586a7aa085f58c9851	commit \| diff

Merge branch 'icount-update' into HEAD

Merge the original development branch due to breakage caused by the
MTTCG merge.

Conflicts:
cpu-exec.c
translate-common.c

Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>

cpu-exec.c	diff1 \|	diff2 \|	blob \| history
include/qom/cpu.h	diff1 \|	diff2 \|	blob \| history
qom/cpu.c	diff1 \|	diff2 \|	blob \| history
tcg/tcg.h	diff1 \|	diff2 \|	blob \| history
translate-all.c	diff1 \|	diff2 \|	blob \| history
translate-common.c	diff1 \|	diff2 \|	blob \| history

AR7 emulation for QEMU