diff options
| author | Michael S. Tsirkin <mst@redhat.com> | 2011-06-14 17:51:11 +0300 |
|---|---|---|
| committer | Michael S. Tsirkin <mst@redhat.com> | 2011-06-15 18:27:15 +0300 |
| commit | befeac45d4d9afb587eca9a27d975db4a7950960 (patch) | |
| tree | aab24c856a3ea944e287d7f2591bb4bab6a56eb4 /pc-bios | |
| parent | 35f754620615138aaae0ef72602f84c88fd8de0f (diff) | |
| parent | 0b862cedf36d927818c50584ddd611b0370673df (diff) | |
Merge remote-tracking branch 'origin/master' into pci
Conflicts:
hw/virtio-pci.c
Diffstat (limited to 'pc-bios')
| -rw-r--r-- | pc-bios/s390-zipl.rom | bin | 3336 -> 3304 bytes |
1 files changed, 0 insertions, 0 deletions
diff --git a/pc-bios/s390-zipl.rom b/pc-bios/s390-zipl.rom Binary files differindex f7af9b155d..3115128efe 100644 --- a/pc-bios/s390-zipl.rom +++ b/pc-bios/s390-zipl.rom |