| commit | 2925689bdefab7cb34659b25a81329b075a3a4b7 | |
| author | Avi Kivity <avi@redhat.com> | |
| Thu, 25 Jun 2009 14:29:03 +0000 (25 17:29 +0300) | ||
| committer | Avi Kivity <avi@redhat.com> | |
| Thu, 25 Jun 2009 14:29:03 +0000 (25 17:29 +0300) | ||
| tree | 298485ff13235e12592474f771b48d650d6994b6 | treesnapshot (tar.gz zip) |
| parent | ebe780cd56d9f641436a6280ba0b10404d95cdcb | commitdiff |
| parent | 406c8df3a96414c2c9602081727f0782369de699 | commitdiff |
Merge commit '406c8df3a96414c2c9602081727f0782369de699' into upstream-merge
* commit '406c8df3a96414c2c9602081727f0782369de699':
Make nic option rom loading less painful.
Conflicts:
vl.c
Signed-off-by: Avi Kivity <avi@redhat.com>
* commit '406c8df3a96414c2c9602081727f0782369de699':
Make nic option rom loading less painful.
Conflicts:
vl.c
Signed-off-by: Avi Kivity <avi@redhat.com>
| hw/pc.c | diff1 | diff2 | blobhistory |
| net.c | diff1 | diff2 | blobhistory |
| net.h | diff1 | diff2 | blobhistory |
| vl.c | diff1 | diff2 | blobhistory |