From: Michael Roth <mdroth@linux.vnet.ibm.com>
Date: Tue, 24 Jul 2018 19:12:14 +0000 (-0500)
Subject: Merge tag 's390x-20180724-212-stable' into stable-2.12-staging
X-Git-Tag: v2.12.1~7
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=2f36efaeb15761d6863ea29c6fbeaf15d596cc17;p=thirdparty%2Fqemu.git

Merge tag 's390x-20180724-212-stable' into stable-2.12-staging

update s390-ccw.img for stable
---

2f36efaeb15761d6863ea29c6fbeaf15d596cc17