summary refs log tree commit diff stats
path: root/scripts/simpletrace.py
diff options
context:
space:
mode:
authorPeter Maydell <peter.maydell@linaro.org>2017-08-15 09:39:14 +0100
committerPeter Maydell <peter.maydell@linaro.org>2017-08-15 09:39:14 +0100
commit5681da292242550f37ba4c03f46a8a6f8ee9278a (patch)
tree79e60aaa6a7523ead06ebe7089b6418a883776ba /scripts/simpletrace.py
parent83c3a1f61673ef554facf4d6d29ed56c5a219f9d (diff)
parent88b3739acdec0b8ccdbb65425b0d31235e2c7ca3 (diff)
downloadfocaccia-qemu-5681da292242550f37ba4c03f46a8a6f8ee9278a.tar.gz
focaccia-qemu-5681da292242550f37ba4c03f46a8a6f8ee9278a.zip
Merge remote-tracking branch 'remotes/cohuck/tags/s390x-20170815' into staging
Regression fix for 'make clean' on s390x.

# gpg: Signature made Tue 15 Aug 2017 08:24:54 BST
# gpg:                using RSA key 0xDECF6B93C6F02FAF
# gpg: Good signature from "Cornelia Huck <conny@cornelia-huck.de>"
# gpg:                 aka "Cornelia Huck <huckc@linux.vnet.ibm.com>"
# gpg:                 aka "Cornelia Huck <cornelia.huck@de.ibm.com>"
# gpg:                 aka "Cornelia Huck <cohuck@kernel.org>"
# gpg:                 aka "Cornelia Huck <cohuck@redhat.com>"
# Primary key fingerprint: C3D0 D66D C362 4FF6 A8C0  18CE DECF 6B93 C6F0 2FAF

* remotes/cohuck/tags/s390x-20170815:
  pc-bios/s390-ccw: Use rm command during make clean

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'scripts/simpletrace.py')
0 files changed, 0 insertions, 0 deletions