diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2014-06-30 15:56:00 +0100 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2014-06-30 15:56:00 +0100 |
| commit | ec9fe956d5c728da770db5ec9bc429080ccb5043 (patch) | |
| tree | 0923a1fc3feaafa115e329c518d6622fb44616dc /hw/arm/omap2.c | |
| parent | a4b31047c851c9a84247a9cc634eca5f99f559a6 (diff) | |
| parent | af35e5e1fb8c334498c61cb9a568719483955a8f (diff) | |
| download | focaccia-qemu-ec9fe956d5c728da770db5ec9bc429080ccb5043.tar.gz focaccia-qemu-ec9fe956d5c728da770db5ec9bc429080ccb5043.zip | |
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>
Diffstat (limited to 'hw/arm/omap2.c')
0 files changed, 0 insertions, 0 deletions