diff options
author | 2009-10-08 14:15:51 +0100 | |
---|---|---|
committer | 2009-10-08 14:15:51 +0100 | |
commit | e96d308d7722e77d9c36c2e748d1153c4a72758c (patch) | |
tree | 1ddd08f3d790a32db1f530a20715d1afa437fdda /sysemu.h | |
parent | Revert "qemu/pci: reset device registers on bus reset" (diff) | |
parent | Reorganize option rom (+linux kernel) loading. (diff) | |
download | qemu-kvm-e96d308d7722e77d9c36c2e748d1153c4a72758c.tar.gz qemu-kvm-e96d308d7722e77d9c36c2e748d1153c4a72758c.tar.bz2 qemu-kvm-e96d308d7722e77d9c36c2e748d1153c4a72758c.zip |
Merge commit '45a50b1668822c23afc2a89f724654e176518bc4'
Conflicts:
hw/pc.c
Signed-off-by: Mark McLoughlin <markmc@redhat.com>
Diffstat (limited to 'sysemu.h')
0 files changed, 0 insertions, 0 deletions