]> git.proxmox.com Git - mirror_qemu.git/commit
Merge remote-tracking branch 'remotes/amit/for-2.1' into staging
authorPeter Maydell <peter.maydell@linaro.org>
Thu, 17 Jul 2014 10:18:51 +0000 (11:18 +0100)
committerPeter Maydell <peter.maydell@linaro.org>
Thu, 17 Jul 2014 10:18:51 +0000 (11:18 +0100)
commit104369c8c7c116e7656ee6344d66ac872fd86143
treea43ebde072dc408b8dbfe0b07f6a58dfb4afcb11
parent5a7348045091a2bc15d85bb177e5956aa6114e5a
parent57d84cf35302fe51789c18354bf09a521bb603df
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>