From: Aurelien Jarno <aurelien@aurel32.net>
Date: Mon, 6 May 2013 17:56:27 +0000 (+0200)
Subject: Merge branch 's390-for-upstream' of git://github.com/agraf/qemu
X-Git-Tag: qemu-xen-4.4.0-rc1~6^2~445
X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=fe677fd1b3fde96110898fde5101bea4cfe6e063;p=qemu-upstream-4.5-testing.git

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
---

fe677fd1b3fde96110898fde5101bea4cfe6e063