projects / sdk / emulator / qemu.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 08ab597 d0a0bfe)
Merge remote-tracking branch 'remotes/amit/for-2.2' into staging
authorPeter Maydell <peter.maydell@linaro.org>
Mon, 18 Aug 2014 17:24:38 +0000 (18:24 +0100)
committerPeter Maydell <peter.maydell@linaro.org>
Mon, 18 Aug 2014 17:24:38 +0000 (18:24 +0100)
* remotes/amit/for-2.2:
  virtio-serial: search for duplicate port names before adding new ports
  virtio-serial: create a linked list of all active devices

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

Trivial merge
Domain: SDK / Emulator;