summaryrefslogtreecommitdiff
path: root/pc-bios/s390-ccw.img
diff options
context:
space:
mode:
authorAnthony Liguori <aliguori@us.ibm.com>2013-07-29 07:30:21 -0500
committerAnthony Liguori <aliguori@us.ibm.com>2013-07-29 07:30:21 -0500
commitb0a71c3b397b12db727ce483f01b3336160ef6a1 (patch)
tree7ee48415239830c788ce4438624c39f6041b3963 /pc-bios/s390-ccw.img
parentf60a0d6ab9ea9ba900ba3936c3471851f28f7bc4 (diff)
parent867b18db2155c0c99ab767c4ac563e144c85871d (diff)
downloadqemu-b0a71c3b397b12db727ce483f01b3336160ef6a1.tar.gz
Merge remote-tracking branch 'agraf/s390-for-upstream' into staging
# By Alexander Graf (1) and others # Via Alexander Graf * agraf/s390-for-upstream: s390: update s390-ccw.img s390/ipl: Fix boot order s390/IPL: Allow boot from other ssid than 0 Message-id: 1375092324-23943-1-git-send-email-agraf@suse.de Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
Diffstat (limited to 'pc-bios/s390-ccw.img')
-rw-r--r--pc-bios/s390-ccw.imgbin9432 -> 9432 bytes
1 files changed, 0 insertions, 0 deletions
diff --git a/pc-bios/s390-ccw.img b/pc-bios/s390-ccw.img
index 1b2a11e728..05fc7c2fae 100644
--- a/pc-bios/s390-ccw.img
+++ b/pc-bios/s390-ccw.img
Binary files differ