diff options
author | Aurelien Jarno <aurelien@aurel32.net> | 2013-05-06 19:56:27 +0200 |
---|---|---|
committer | Aurelien Jarno <aurelien@aurel32.net> | 2013-05-06 19:56:27 +0200 |
commit | fe677fd1b3fde96110898fde5101bea4cfe6e063 (patch) | |
tree | 8e1134a7a8dbcc189495348eee34827fac233ccb /pc-bios/s390-ccw.img | |
parent | e0ff466c86bfb3b865865431bf8aa67287691917 (diff) | |
parent | 2ddef429d14136a0156a75b1d77b72cb3bdad18f (diff) |
Merge branch 's390-for-upstream' of git://github.com/agraf/qemu
* 's390-for-upstream' of git://github.com/agraf/qemu:
s390: update s390-ccw.img
S390: BIOS boot from given device
S390: Add virtio-blk boot
S390: Merging s390_ipl_cpu and s390_ipl_reset
S390: BIOS create link to src folder for .img file
S390: BIOS check for file
Diffstat (limited to 'pc-bios/s390-ccw.img')
-rw-r--r-- | pc-bios/s390-ccw.img | bin | 9432 -> 9432 bytes |
1 files changed, 0 insertions, 0 deletions
diff --git a/pc-bios/s390-ccw.img b/pc-bios/s390-ccw.img Binary files differindex 149cf70140..1b2a11e728 100644 --- a/pc-bios/s390-ccw.img +++ b/pc-bios/s390-ccw.img |