tree 059f6801255605ff19fbc616c19a2e2a6abb1b5f
parent 4b6eda626fdb8bf90472c6868d502a2ac09abeeb
parent 1d649244b3695cb148dd2ae66999db0f6f9566b3
author Peter Maydell <peter.maydell@linaro.org> 1448451483 +0000
committer Peter Maydell <peter.maydell@linaro.org> 1448451483 +0000
mergetag object 1d649244b3695cb148dd2ae66999db0f6f9566b3
 type commit
 tag pull-ivshmem-2015-11-25
 tagger Markus Armbruster <armbru@redhat.com> 1448443538 +0100
 
 ivshmem patches for 2.5
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1
 
 iQIcBAABAgAGBQJWVX6SAAoJEDhwtADrkYZTZyoP/jYDr+mK3PkimysF42/rE1cW
 IJBLd7MRJWSLdflmJjn/lDbmo11KNR49i2XerTVK2znKG53egObVmdkESazdz4wm
 J4XKFqpKPcOaeeicxjeNly8Hq5okk6gvOoP5+vJvvu8GZFGrwAg6DFMP3xEs5CVv
 NfySXBUYOIi8jvtzvwesjh7nOfTv9mKWIKA3m7Fli9TjMG8X8UjilKtWVDPLo4ev
 pzTFNSchi/AoYh4Fdl+E7guGW6SOiwjAPJCDTuHNra0Fadj5RsV4X4E7AsMXAP+T
 WZzTzn+GEtyGC7yjhCy448u7f1lPlXUFfYnIsNOtQ6azrEbaNo0i8IFFmpdFSVRe
 Medl71TQBGR9roLKhyZYVfH/KveVpqyIxkPa3azC2vTGiDtNmqJ0e0+uxDDMIT0R
 HnAZc+7rSdVpDItVibrExYA92q5m9qN8GqhS6dflbYu2cy54uPa33dR5xKUPNU5Q
 moYVl3E5uLz8Tdj3gbyc+rvyPiT7vYCvZlGP/e81ZSIRepiQKadI3Qkhx879336f
 gzuGHOtaTBTz36XGQsQBJC1rZ+3TjC+VylOUttPH0GqqlIfoUdvA/tdbiXmO6DpY
 N99H6RlBAD+Tw6Y7g6M1BwT9a7TBhkeeMdRWZSYeC4jw3T6AslBfBwcKbmTmE/NC
 hTZ7RNdZ7FeFa5ZH/LhE
 =/gHp
 -----END PGP SIGNATURE-----

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 <armbru@redhat.com>"
# gpg:                 aka "Markus Armbruster <armbru@pond.sub.org>"

* 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 <peter.maydell@linaro.org>