Merge remote-tracking branch 'remotes/amit/tags/vs-for-2.6-1' into staging
commited56fdb25692920d2e2915b9c979ad477b0c018e
authorPeter Maydell <peter.maydell@linaro.org>
Thu, 14 Jan 2016 11:16:50 +0000 (14 11:16 +0000)
committerPeter Maydell <peter.maydell@linaro.org>
Thu, 14 Jan 2016 11:16:50 +0000 (14 11:16 +0000)
tree9af39937a52023ffe89559f085cd148408336026
parent91728bda76c1bfe49ac680af763154ec51988732
parentd9eb0be229635a8c625a0a3d29d2d88aba1508a5
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>