From: Peter Maydell <peter.maydell@linaro.org>
Date: Thu, 17 Jul 2014 10:18:51 +0000 (+0100)
Subject: Merge remote-tracking branch 'remotes/amit/for-2.1' into staging
X-Git-Tag: v2.1.0-rc3~14
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=104369c8c7c116e7656ee6344d66ac872fd86143;p=thirdparty%2Fqemu.git

Merge remote-tracking branch 'remotes/amit/for-2.1' into staging

* remotes/amit/for-2.1:
  virtio-serial-bus: keep port 0 reserved for virtconsole even on unplug

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

104369c8c7c116e7656ee6344d66ac872fd86143