diff options
| author | Marcelo Tosatti <mtosatti@redhat.com> | 2010-02-17 04:28:00 -0200 |
|---|---|---|
| committer | Avi Kivity <avi@redhat.com> | 2010-02-17 11:14:02 +0200 |
| commit | af2a7f6a9ac195c7d1999237e89674ec53136c13 (patch) | |
| tree | ab1f108ab7c46c7a9942a95af361824a3a566717 /pc-bios | |
| parent | ed880109f74f0a4dd5b7ec09e6a2d9ba4903d9a5 (diff) | |
| parent | 282ab3a578b442a157b9cb4d2c19492d2aad1e55 (diff) | |
Merge branch 'upstream-merge'
* upstream-merge: (159 commits)
crisv10: Prettify.
sparc32 fix spurious dma interrupts v2
Revert "Sparc32: improve DMA controller IRQ debugging"
cris: Add support for CRISv10 translation.
cris: Use tcg_gen_movi_tl.
cris: Add v10 style interrupts.
crisv10: Always clear the V and C flags on btst.
cris: Prepare for CRISv10.
dec: use PCI accessors
sparc64: use PCI accessors for APB/PBM
Remove conditional rom loading support
Fix incorrect exception_index use
pci: fix info pci with host bridge.
ide: add topology support
scsi: add topology support
virtio-blk: add topology support
block: add topology qdev properties
virtio-blk: revert serial number support
Increase VNC_MAX_WIDTH
qemu-img: use the heap instead of the huge stack array for win32
...
Signed-off-by: Marcelo Tosatti <mtosatti@redhat.com>
Signed-off-by: Avi Kivity <avi@redhat.com>
Diffstat (limited to 'pc-bios')
| -rw-r--r-- | pc-bios/bios.bin | bin | 131072 -> 131072 bytes |
1 files changed, 0 insertions, 0 deletions
diff --git a/pc-bios/bios.bin b/pc-bios/bios.bin Binary files differindex 9d631c743..827327db9 100644 --- a/pc-bios/bios.bin +++ b/pc-bios/bios.bin |