Merge commit 'd67c3f2cd92aed2247bfa8a9da61a902b7b2ff09' into upstream…

…-merge * commit 'd67c3f2cd92aed2247bfa8a9da61a902b7b2ff09': seabios: update to master Conflicts: roms/seabios Signed-off-by: Marcelo Tosatti <[email protected]>
ceph · Aug 23, 2011 · 6c8bb08 · 6c8bb08
2 parents 44755ea + d67c3f2
commit 6c8bb08
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 1 deletion.
diff --git a/pc-bios/bios.bin b/pc-bios/bios.bin
diff --git a/roms/seabios b/roms/seabios