diff options
| author | Anthony Liguori <aliguori@us.ibm.com> | 2012-02-24 09:45:22 -0600 |
|---|---|---|
| committer | Anthony Liguori <aliguori@us.ibm.com> | 2012-02-24 09:45:22 -0600 |
| commit | 7c1daf341f3374a490a03dfcde17021d3369aa48 (patch) | |
| tree | f45381088a6d7fad7778ffd5cef6602f0aa3d640 /vgafont.h | |
| parent | 5105b6d88d1958de8c12672fba7e30a0b0f38653 (diff) | |
| parent | 6f382ed226f3a408825d882e6c4b47499baaa15b (diff) | |
Merge remote-tracking branch 'qmp/queue/qmp' into staging
* qmp/queue/qmp:
qmp: add DEVICE_TRAY_MOVED event
ide: drop ide_tray_state_post_load()
block: Don't call bdrv_eject() if the tray state didn't change
block: bdrv_eject(): Make eject_flag a real bool
block: Rename bdrv_mon_event() & BlockMonEventAction
Diffstat (limited to 'vgafont.h')
0 files changed, 0 insertions, 0 deletions