diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2018-10-29 17:03:27 +0000 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2018-10-29 17:03:27 +0000 |
| commit | 62b658db1df7c6fa574caae038144f24bf6ca495 (patch) | |
| tree | 92e8a5ce05330fc1b259eda555e76329c50a24f1 /block.c | |
| parent | db7069133e2aab279efa999b7de3d241bb219acf (diff) | |
| parent | bd54b11062c4baa7d2e4efadcf71b8cfd55311fd (diff) | |
| download | qemu-62b658db1df7c6fa574caae038144f24bf6ca495.zip qemu-62b658db1df7c6fa574caae038144f24bf6ca495.tar.gz qemu-62b658db1df7c6fa574caae038144f24bf6ca495.tar.bz2 | |
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>
Diffstat (limited to 'block.c')
0 files changed, 0 insertions, 0 deletions