]> rtime.felk.cvut.cz Git - lisovros/qemu_apohw.git/commitdiff
projects / lisovros / qemu_apohw.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 5a73480 57d84cf)
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)
* 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>

Trivial merge
Virtual HW used in A0B36APO subject