Merge remote-tracking branch 'remotes/amit/tags/vser-2.2.0-queue-2' into staging
commit7b4b7c5fc7f25a161839802ca7d23f50f99e5174
authorPeter Maydell <peter.maydell@linaro.org>
Mon, 10 Nov 2014 11:58:39 +0000 (10 11:58 +0000)
committerPeter Maydell <peter.maydell@linaro.org>
Mon, 10 Nov 2014 11:58:39 +0000 (10 11:58 +0000)
tree5fdf8404ad728224d55a160d8f2f5a3887856c38
parent6e76d125f244e10676b917208f2a074729820246
parent7eb7311427a6e2a9e080c1224f86a897f077282f
Merge remote-tracking branch 'remotes/amit/tags/vser-2.2.0-queue-2' into staging

Fixes a crash when a virtio-serial port is added without a name to it.

# gpg: Signature made Fri 07 Nov 2014 04:58:05 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/vser-2.2.0-queue-2:
  virtio-serial: avoid crash when port has no name

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