diff options
| author | Paolo Bonzini | 2017-03-03 16:39:18 +0100 |
|---|---|---|
| committer | Paolo Bonzini | 2017-03-03 16:39:18 +0100 |
| commit | 30f3dda24b2a4cd30f8fbf984ab08ef08eaf5020 (patch) | |
| tree | 5d70d2f93f28b4935c68b48482cdba5302b410ba /util/oslib-posix.c | |
| parent | dtc: Revert unintentional submodule downgrade from commit 077dd74239a99 (diff) | |
| parent | cpu-exec: remove unnecessary check of cpu->exit_request (diff) | |
| download | qemu-30f3dda24b2a4cd30f8fbf984ab08ef08eaf5020.tar.gz qemu-30f3dda24b2a4cd30f8fbf984ab08ef08eaf5020.tar.xz qemu-30f3dda24b2a4cd30f8fbf984ab08ef08eaf5020.zip | |
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>
Diffstat (limited to 'util/oslib-posix.c')
0 files changed, 0 insertions, 0 deletions