diff options
author | Anthony Liguori <aliguori@us.ibm.com> | 2012-12-13 11:41:25 -0600 |
---|---|---|
committer | Anthony Liguori <aliguori@us.ibm.com> | 2012-12-13 11:41:25 -0600 |
commit | aa1246aee2914424f101a7e462bd1393ececef95 (patch) | |
tree | 3fd63bc915a389f6129ae9f6ce8de931a52aacc9 | |
parent | 5a58598090d1349d2bd3e9015e6999dcf87ec5b5 (diff) | |
parent | ff1562908d1da12362aa9e3f3bfc7ba0da8114a4 (diff) | |
download | qemu-aa1246aee2914424f101a7e462bd1393ececef95.zip qemu-aa1246aee2914424f101a7e462bd1393ececef95.tar.gz qemu-aa1246aee2914424f101a7e462bd1393ececef95.tar.bz2 |
Merge remote-tracking branch 'kraxel/seabios-e8a76b0' into staging
* kraxel/seabios-e8a76b0:
seabios: update to e8a76b0f225bba5ba9d63ab227e0a37b3beb1059
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
-rw-r--r-- | pc-bios/acpi-dsdt.aml | bin | 4540 -> 4438 bytes | |||
-rw-r--r-- | pc-bios/bios.bin | bin | 131072 -> 262144 bytes | |||
-rw-r--r-- | pc-bios/q35-acpi-dsdt.aml | bin | 0 -> 7458 bytes | |||
m--------- | roms/seabios | 0 |
4 files changed, 0 insertions, 0 deletions
diff --git a/pc-bios/acpi-dsdt.aml b/pc-bios/acpi-dsdt.aml Binary files differindex bb3dd83..18b4dc1 100644 --- a/pc-bios/acpi-dsdt.aml +++ b/pc-bios/acpi-dsdt.aml diff --git a/pc-bios/bios.bin b/pc-bios/bios.bin Binary files differindex dc9b57d..3eefff4 100644 --- a/pc-bios/bios.bin +++ b/pc-bios/bios.bin diff --git a/pc-bios/q35-acpi-dsdt.aml b/pc-bios/q35-acpi-dsdt.aml Binary files differnew file mode 100644 index 0000000..8a50559 --- /dev/null +++ b/pc-bios/q35-acpi-dsdt.aml diff --git a/roms/seabios b/roms/seabios -Subproject b1c35f2b28cc0c94ebed8176ff61ac0e0b37779 +Subproject e8a76b0f225bba5ba9d63ab227e0a37b3beb105 |