| commit | 2fb0744e0dde372223f627dba99934559aa06e14 | |
| author | Marcelo Tosatti <mtosatti@redhat.com> | |
| Fri, 6 Nov 2009 12:32:14 +0000 (6 10:32 -0200) | ||
| committer | Marcelo Tosatti <mtosatti@redhat.com> | |
| Fri, 6 Nov 2009 12:32:14 +0000 (6 10:32 -0200) | ||
| tree | fc6625811de6e5b77a7dd5e29766f063703f0b18 | treesnapshot (tar.gz zip) |
| parent | 323bd2479ec180f66d0473cd25fe4e118233db20 | commitdiff |
| parent | 04095e5ff305fc25a214b52e005153af9d009d66 | commitdiff |
Merge commit '04095e5ff305fc25a214b52e005153af9d009d66' into upstream-merge
* commit '04095e5ff305fc25a214b52e005153af9d009d66':
Remove e1000 rom loading hack
Switch from etherboot to gPXE
Conflicts:
hw/pc.c
Signed-off-by: Marcelo Tosatti <mtosatti@redhat.com>
* commit '04095e5ff305fc25a214b52e005153af9d009d66':
Remove e1000 rom loading hack
Switch from etherboot to gPXE
Conflicts:
hw/pc.c
Signed-off-by: Marcelo Tosatti <mtosatti@redhat.com>
| Makefile | diff1 | diff2 | blobhistory |
| hw/pc.c | diff1 | diff2 | blobhistory |