]> git.proxmox.com Git - mirror_qemu.git/commitdiff
Merge branch 'exec_rw_const_v4' of https://github.com/philmd/qemu into HEAD
authorPaolo Bonzini <pbonzini@redhat.com>
Tue, 25 Feb 2020 12:41:48 +0000 (13:41 +0100)
committerPaolo Bonzini <pbonzini@redhat.com>
Tue, 25 Feb 2020 12:41:48 +0000 (13:41 +0100)
1  2 
accel/kvm/kvm-all.c
exec.c
hw/ppc/spapr_hcall.c
qtest.c
target/i386/whpx-all.c

Simple merge
diff --cc exec.c
Simple merge
Simple merge
diff --cc qtest.c
Simple merge
Simple merge