diff options
author | Anthony Liguori <aliguori@us.ibm.com> | 2013-07-29 07:30:21 -0500 |
---|---|---|
committer | Anthony Liguori <aliguori@us.ibm.com> | 2013-07-29 07:30:21 -0500 |
commit | b0a71c3b397b12db727ce483f01b3336160ef6a1 (patch) | |
tree | 7ee48415239830c788ce4438624c39f6041b3963 /target-m68k | |
parent | f60a0d6ab9ea9ba900ba3936c3471851f28f7bc4 (diff) | |
parent | 867b18db2155c0c99ab767c4ac563e144c85871d (diff) | |
download | qemu-b0a71c3b397b12db727ce483f01b3336160ef6a1.tar.gz qemu-b0a71c3b397b12db727ce483f01b3336160ef6a1.tar.bz2 qemu-b0a71c3b397b12db727ce483f01b3336160ef6a1.zip |
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 'target-m68k')
0 files changed, 0 insertions, 0 deletions