Merge remote-tracking branch 'remotes/cody/tags/block-pull-request' into staging
commit1d889f2a8baaa265939b339d2f52ec57f5b8a09c
authorPeter Maydell <peter.maydell@linaro.org>
Tue, 5 Jun 2018 14:22:07 +0000 (5 15:22 +0100)
committerPeter Maydell <peter.maydell@linaro.org>
Tue, 5 Jun 2018 14:22:07 +0000 (5 15:22 +0100)
tree3ca2960edfd6412cd61ee0b7ff4be7de34a115d4
parent41feb5b955f0d7c9d071b2c5adbc404ae2895c7a
parent68acc99f143b60ec4faa2903065b187d4d3c4bf3
Merge remote-tracking branch 'remotes/cody/tags/block-pull-request' into staging

# gpg: Signature made Tue 05 Jun 2018 15:17:18 BST
# gpg:                using RSA key BDBE7B27C0DE3057
# gpg: Good signature from "Jeffrey Cody <jcody@redhat.com>"
# gpg:                 aka "Jeffrey Cody <jeff@codyprime.org>"
# gpg:                 aka "Jeffrey Cody <codyprime@gmail.com>"
# Primary key fingerprint: 9957 4B4D 3474 90E7 9D98  D624 BDBE 7B27 C0DE 3057

* remotes/cody/tags/block-pull-request:
  sheepdog: remove huge BSS object
  sheepdog: cleanup repeated expression

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