From: Peter Maydell <peter.maydell@linaro.org>
Date: Wed, 13 Apr 2016 17:48:28 +0000 (+0100)
Subject: Merge remote-tracking branch 'remotes/elmarco/tags/ivshmem-fix-pull-request' into... 
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=8b4aaba736e55c8ab6d71350f850a6642f0165b9;p=qemu.git

Merge remote-tracking branch 'remotes/elmarco/tags/ivshmem-fix-pull-request' into staging

# gpg: Signature made Wed 13 Apr 2016 11:04:51 BST using RSA key ID 75969CE5
# gpg: Good signature from "Marc-André Lureau <marcandre.lureau@redhat.com>"
# gpg:                 aka "Marc-André Lureau <marcandre.lureau@gmail.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: 87A9 BD93 3F87 C606 D276  F62D DAE8 E109 7596 9CE5

* remotes/elmarco/tags/ivshmem-fix-pull-request:
  ivshmem: fix ivshmem-{plain,doorbell} crash without arg

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

8b4aaba736e55c8ab6d71350f850a6642f0165b9