The following changes since commit 4b6eda626fdb8bf90472c6868d502a2ac09abeeb:
Merge remote-tracking branch 'remotes/lalrae/tags/mips-20151124' into staging (2015-11-24 17:05:06 +0000) are available in the git repository at: git://repo.or.cz/qemu/armbru.git tags/pull-ivshmem-2015-11-25 for you to fetch changes up to 1d649244b3695cb148dd2ae66999db0f6f9566b3: ivshmem: Rename property memdev to x-memdev for 2.5 (2015-11-25 10:24:27 +0100) ---------------------------------------------------------------- ivshmem patches for 2.5 ---------------------------------------------------------------- Markus Armbruster (5): qemu-doc: Fix ivshmem example markup qemu-doc: Fix ivshmem usage example with shm=... tests/ivshmem-test: Supply missing initializer in get_device() ivshmem: Mark questionable socket type test FIXME ivshmem: Rename property memdev to x-memdev for 2.5 hw/misc/ivshmem.c | 9 ++++----- qemu-doc.texi | 10 +++++----- tests/ivshmem-test.c | 3 ++- 3 files changed, 11 insertions(+), 11 deletions(-) -- 2.4.3