]> git.proxmox.com Git - qemu.git/commit
Merge remote-tracking branch 'agraf/s390-for-upstream' into staging
authorAnthony Liguori <aliguori@us.ibm.com>
Mon, 29 Jul 2013 12:30:21 +0000 (07:30 -0500)
committerAnthony Liguori <aliguori@us.ibm.com>
Mon, 29 Jul 2013 12:30:21 +0000 (07:30 -0500)
commitb0a71c3b397b12db727ce483f01b3336160ef6a1
tree7ee48415239830c788ce4438624c39f6041b3963
parentf60a0d6ab9ea9ba900ba3936c3471851f28f7bc4
parent867b18db2155c0c99ab767c4ac563e144c85871d
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>