projects / qemu.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: a4b3104 af35e5e)
Merge remote-tracking branch 'remotes/bonzini/small-fixes' into staging
authorPeter Maydell <peter.maydell@linaro.org>
Mon, 30 Jun 2014 14:56:00 +0000 (15:56 +0100)
committerPeter Maydell <peter.maydell@linaro.org>
Mon, 30 Jun 2014 14:56:00 +0000 (15:56 +0100)
commitec9fe956d5c728da770db5ec9bc429080ccb5043
tree0923a1fc3feaafa115e329c518d6622fb44616dctree | snapshot
parenta4b31047c851c9a84247a9cc634eca5f99f559a6commit | diff
parentaf35e5e1fb8c334498c61cb9a568719483955a8fcommit | diff
Merge remote-tracking branch 'remotes/bonzini/small-fixes' into staging

* remotes/bonzini/small-fixes:
  tests/test-qmp-event: fix for GLib < 2.31
  serial: poll the serial console with G_IO_HUP

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Unnamed repository; edit this file 'description' to name the repository.