projects / qemu.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (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)
* 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>

Trivial merge
Unnamed repository; edit this file 'description' to name the repository.