diff options
| author | Michael S. Tsirkin <mst@redhat.com> | 2010-12-01 07:11:51 +0200 |
|---|---|---|
| committer | Michael S. Tsirkin <mst@redhat.com> | 2010-12-01 07:11:51 +0200 |
| commit | c924f36a300cbc54d3cb511116e8e2bae17f5ae6 (patch) | |
| tree | 04e57676b1db1db7d8b33934b349f8f37780fa2a /pc-bios/vgabios-cirrus.bin | |
| parent | 1abeb5a65d515f8a8a9cfc4a82342f731bd9321f (diff) | |
| parent | 09fa35e5cdc7d17ed3e1528ca743893ae77a0ea2 (diff) | |
Merge remote branch 'origin/master' into pci
Conflicts:
Makefile.objs
hw/virtio.c
Diffstat (limited to 'pc-bios/vgabios-cirrus.bin')
| -rw-r--r-- | pc-bios/vgabios-cirrus.bin | bin | 35840 -> 35840 bytes |
1 files changed, 0 insertions, 0 deletions
diff --git a/pc-bios/vgabios-cirrus.bin b/pc-bios/vgabios-cirrus.bin Binary files differindex 4fa8f99f7e..424dd0c70c 100644 --- a/pc-bios/vgabios-cirrus.bin +++ b/pc-bios/vgabios-cirrus.bin |