tree 5d70d2f93f28b4935c68b48482cdba5302b410ba
parent 508e038a5d725f2aa729f58a1f5209b9be4227de
parent 55ac0a9bf4e1b1adfc7d73586a7aa085f58c9851
author Paolo Bonzini <pbonzini@redhat.com> 1488555558 +0100
committer Paolo Bonzini <pbonzini@redhat.com> 1488555558 +0100

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>