projects / qemu.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 510981a 91bdd1c)
Merge remote-tracking branch 'amit/master' into staging
authorAnthony Liguori <aliguori@us.ibm.com>
Tue, 18 Dec 2012 21:41:32 +0000 (15:41 -0600)
committerAnthony Liguori <aliguori@us.ibm.com>
Tue, 18 Dec 2012 21:41:32 +0000 (15:41 -0600)
commit5455a474d92e345df83212fd1b2f59d4a5d46ca9
tree7f5d7a7f97764c59a0760aeee15af76759c4ff5ftree | snapshot
parent510981a097bf16ef4747c9a1dfe806edfc117177commit | diff
parent91bdd1cf08f65b7a127c22d4d65ff9d16dcac870commit | diff
Merge remote-tracking branch 'amit/master' into staging

* amit/master:
  virtio-serial-bus: assert port is non-null in remove_port()
  virtio-serial-bus: send_control_msg() should not deal with cpkts
  virtio-serial: delete timer if active during exit
  virtio-serial: allocate post_load only at load-time
  virtio-serial: move active ports loading to separate function
  virtio-serial: use uint32_t to count ports

Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
Unnamed repository; edit this file 'description' to name the repository.