From: Peter Maydell Date: Wed, 25 Nov 2015 11:38:03 +0000 (+0000) Subject: Merge remote-tracking branch 'remotes/armbru/tags/pull-ivshmem-2015-11-25' into staging X-Git-Tag: v2.5.0-rc2~10 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=1aae36df4b8ed884c6ef6995e70c67fad79b49df;p=thirdparty%2Fqemu.git Merge remote-tracking branch 'remotes/armbru/tags/pull-ivshmem-2015-11-25' into staging ivshmem patches for 2.5 # gpg: Signature made Wed 25 Nov 2015 09:25:38 GMT using RSA key ID EB918653 # gpg: Good signature from "Markus Armbruster " # gpg: aka "Markus Armbruster " * remotes/armbru/tags/pull-ivshmem-2015-11-25: ivshmem: Rename property memdev to x-memdev for 2.5 ivshmem: Mark questionable socket type test FIXME tests/ivshmem-test: Supply missing initializer in get_device() qemu-doc: Fix ivshmem usage example with shm=... qemu-doc: Fix ivshmem example markup Signed-off-by: Peter Maydell --- 1aae36df4b8ed884c6ef6995e70c67fad79b49df