| commit | 42baf3e47bdef812cc9b76c18a53ad91db2537eb | |
| author | Avi Kivity <avi@redhat.com> | |
| Tue, 28 Jul 2009 16:27:26 +0000 (28 19:27 +0300) | ||
| committer | Avi Kivity <avi@redhat.com> | |
| Tue, 28 Jul 2009 16:27:26 +0000 (28 19:27 +0300) | ||
| tree | 0be7923fab86ab4647852f1f9e0ed70ae347097e | treesnapshot (tar.gz zip) |
| parent | 2443970fb62d06b1c171ddd2bc15978b988e2fa5 | commitdiff |
| parent | ef2039f17d3e2226b8650b4d7692e5f458a37573 | commitdiff |
Merge commit 'ef2039f17d3e2226b8650b4d7692e5f458a37573' into upstream-merge
* commit 'ef2039f17d3e2226b8650b4d7692e5f458a37573':
Regenerate BIOS and add patches for -boot option
Update boot option documentation
Conflicts:
pc-bios/bios.bin (dropped)
Signed-off-by: Avi Kivity <avi@redhat.com>
* commit 'ef2039f17d3e2226b8650b4d7692e5f458a37573':
Regenerate BIOS and add patches for -boot option
Update boot option documentation
Conflicts:
pc-bios/bios.bin (dropped)
Signed-off-by: Avi Kivity <avi@redhat.com>
| qemu-options.hx | diff1 | diff2 | blobhistory |