From: Peter Maydell <peter.maydell@linaro.org>
Date: Mon, 24 Jul 2017 15:20:47 +0000 (+0100)
Subject: Merge remote-tracking branch 'remotes/ericb/tags/pull-nbd-2017-07-24' into staging
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=ce1d20aac8533357650774c2c240e30de87dc122;p=qemu.git

Merge remote-tracking branch 'remotes/ericb/tags/pull-nbd-2017-07-24' into staging

nbd patches for 2017-07-24

- Eric Blake: [0/2] Update qemu-nbd version

# gpg: Signature made Mon 24 Jul 2017 14:58:23 BST
# gpg:                using RSA key 0xA7A16B4A2527436A
# gpg: Good signature from "Eric Blake <eblake@redhat.com>"
# gpg:                 aka "Eric Blake (Free Software Programmer) <ebb9@byu.net>"
# gpg:                 aka "[jpeg image of size 6874]"
# Primary key fingerprint: 71C2 CC22 B1C4 6029 27D2  F3AA A7A1 6B4A 2527 436A

* remotes/ericb/tags/pull-nbd-2017-07-24:
  maint: Reorder include directives for qemu-{nbd, io}
  qemu-nbd: Update version string

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

ce1d20aac8533357650774c2c240e30de87dc122