Merge remote-tracking branch 'remotes/famz/tags/docker-pull-request' into staging
commite3280ffbf59b1546e25b40a87bd3556b211d9191
authorPeter Maydell <peter.maydell@linaro.org>
Wed, 1 Mar 2017 13:06:00 +0000 (1 13:06 +0000)
committerPeter Maydell <peter.maydell@linaro.org>
Wed, 1 Mar 2017 13:06:00 +0000 (1 13:06 +0000)
tree0dd69ec19fed324728996c0d303105b4bb1ee481
parent758af5e8620c24d848e2105c6f8ffef77059edc0
parent1ed9251515382a1fc9c6187fee8d7d7bf141dc90
Merge remote-tracking branch 'remotes/famz/tags/docker-pull-request' into staging

# gpg: Signature made Tue 28 Feb 2017 12:40:00 GMT
# gpg:                using RSA key 0xCA35624C6A9171C6
# gpg: Good signature from "Fam Zheng <famz@redhat.com>"
# gpg: WARNING: This key is not certified with sufficiently trusted signatures!
# gpg:          It is not certain that the signature belongs to the owner.
# Primary key fingerprint: 5003 7CB7 9706 0F76 F021  AD56 CA35 624C 6A91 71C6

* remotes/famz/tags/docker-pull-request:
  .shippable: add s390x-cross target
  new: dockerfiles/debian-s390-cross

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>