From: Peter Maydell <peter.maydell@linaro.org>
Date: Mon, 29 Oct 2018 17:03:27 +0000 (+0000)
Subject: Merge remote-tracking branch 'remotes/stefanha/tags/block-pull-request' into staging
X-Git-Tag: v3.1.0-rc0~28
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=62b658db1df7c6fa574caae038144f24bf6ca495;p=thirdparty%2Fqemu.git

Merge remote-tracking branch 'remotes/stefanha/tags/block-pull-request' into staging

Pull request

No changelog-worthy entries, just small tweaks.

# gpg: Signature made Mon 29 Oct 2018 13:55:54 GMT
# gpg:                using RSA key 9CA4ABB381AB73C8
# gpg: Good signature from "Stefan Hajnoczi <stefanha@redhat.com>"
# gpg:                 aka "Stefan Hajnoczi <stefanha@gmail.com>"
# Primary key fingerprint: 8695 A8BF D3F9 7CDA AC35  775A 9CA4 ABB3 81AB 73C8

* remotes/stefanha/tags/block-pull-request:
  nvdimm: Add docs hint for Linux driver name
  util: aio-posix: fix a typo

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

62b658db1df7c6fa574caae038144f24bf6ca495