| commit | 29f99d284d1c70a612672a4443008026dc7f0e5c | |
| author | Marcelo Tosatti <mtosatti@redhat.com> | |
| Thu, 21 Jan 2010 19:05:50 +0000 (21 17:05 -0200) | ||
| committer | Marcelo Tosatti <mtosatti@redhat.com> | |
| Thu, 21 Jan 2010 19:05:50 +0000 (21 17:05 -0200) | ||
| tree | 3791d098774a0fcc532b7df6c694d76fbcbe9f1b | treesnapshot (tar.gz zip) |
| parent | 1dcf16b46057bc8f50ad2379c3292b4ad31cc92f | commitdiff |
| parent | 88169ddf82853ca892ce7bee279579c8a0ac03e5 | commitdiff |
Merge commit '88169ddf82853ca892ce7bee279579c8a0ac03e5' into upstream-merge
* commit '88169ddf82853ca892ce7bee279579c8a0ac03e5':
pci: allow loading roms via fw_cfg.
Conflicts:
hw/pci.h
Signed-off-by: Marcelo Tosatti <mtosatti@redhat.com>
* commit '88169ddf82853ca892ce7bee279579c8a0ac03e5':
pci: allow loading roms via fw_cfg.
Conflicts:
hw/pci.h
Signed-off-by: Marcelo Tosatti <mtosatti@redhat.com>
| hw/pci.c | diff1 | diff2 | blobhistory |
| hw/pci.h | diff1 | diff2 | blobhistory |