From: Peter Maydell <peter.maydell@linaro.org>
Date: Thu, 14 Jan 2016 11:16:50 +0000 (+0000)
Subject: Merge remote-tracking branch 'remotes/amit/tags/vs-for-2.6-1' into staging
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=ed56fdb25692920d2e2915b9c979ad477b0c018e;p=qmiga%2Fqemu.git

Merge remote-tracking branch 'remotes/amit/tags/vs-for-2.6-1' into staging

small change to qom'ify virtio-serial

# gpg: Signature made Wed 13 Jan 2016 09:51:18 GMT using RSA key ID 854083B6
# gpg: Good signature from "Amit Shah <amit@amitshah.net>"
# gpg:                 aka "Amit Shah <amit@kernel.org>"
# gpg:                 aka "Amit Shah <amitshah@gmx.net>"

* remotes/amit/tags/vs-for-2.6-1:
  virtio serial port: fix to incomplete QOMify

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

ed56fdb25692920d2e2915b9c979ad477b0c018e