diff options
| author | Peter Maydell | 2016-08-16 11:45:00 +0200 |
|---|---|---|
| committer | Peter Maydell | 2016-08-16 11:45:00 +0200 |
| commit | 2d1c8d5456420654d3474cec229243ba823323f1 (patch) | |
| tree | 9d457e063bcf92526da0fec3c9482084e779e53e /scripts/switch-timer-api | |
| parent | Merge remote-tracking branch 'remotes/kevin/tags/for-upstream' into staging (diff) | |
| parent | pc-bios/s390-ccw.img: Fix build (diff) | |
| download | qemu-2d1c8d5456420654d3474cec229243ba823323f1.tar.gz qemu-2d1c8d5456420654d3474cec229243ba823323f1.tar.xz qemu-2d1c8d5456420654d3474cec229243ba823323f1.zip | |
Merge remote-tracking branch 'remotes/cohuck/tags/s390x-20160816' into staging
Build fix for the ccw bios (bios itself not rebuilt).
# gpg: Signature made Tue 16 Aug 2016 08:00:16 BST
# gpg: using RSA key 0xDECF6B93C6F02FAF
# gpg: Good signature from "Cornelia Huck <huckc@linux.vnet.ibm.com>"
# gpg: aka "Cornelia Huck <cornelia.huck@de.ibm.com>"
# Primary key fingerprint: C3D0 D66D C362 4FF6 A8C0 18CE DECF 6B93 C6F0 2FAF
* remotes/cohuck/tags/s390x-20160816:
pc-bios/s390-ccw.img: Fix build
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'scripts/switch-timer-api')
0 files changed, 0 insertions, 0 deletions