From: Anthony Liguori Date: Mon, 29 Jul 2013 12:30:21 +0000 (-0500) Subject: Merge remote-tracking branch 'agraf/s390-for-upstream' into staging X-Git-Tag: v1.6.0-rc0~50 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=b0a71c3b397b12db727ce483f01b3336160ef6a1;p=thirdparty%2Fqemu.git 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 --- b0a71c3b397b12db727ce483f01b3336160ef6a1