aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAnthony Liguori <aliguori@us.ibm.com>2011-08-12 07:50:16 -0500
committerAnthony Liguori <aliguori@us.ibm.com>2011-08-12 07:50:16 -0500
commit9c4dd424c36a97c05063ae3524e1bd8e5a5a3324 (patch)
treeac6864d790590c6b3fa0178072921eb041e155d3
parent8cc7c3952d4d0a681d8d4c3ac89a206a5bfd7f00 (diff)
parentd67c3f2cd92aed2247bfa8a9da61a902b7b2ff09 (diff)
Merge remote-tracking branch 'kraxel/seabios' into staging
-rw-r--r--pc-bios/bios.binbin131072 -> 131072 bytes
m---------roms/seabios0
2 files changed, 0 insertions, 0 deletions
diff --git a/pc-bios/bios.bin b/pc-bios/bios.bin
index bdb48314df..bd9ad0e782 100644
--- a/pc-bios/bios.bin
+++ b/pc-bios/bios.bin
Binary files differ
diff --git a/roms/seabios b/roms/seabios
-Subproject cc975646af69f279396d4d5e1379ac6af80ee63
+Subproject 8e301472e324b6d6496d8b4ffc66863e99d7a50