diff options
| author | Anthony Liguori <aliguori@us.ibm.com> | 2013-06-10 11:37:47 -0500 |
|---|---|---|
| committer | Anthony Liguori <aliguori@us.ibm.com> | 2013-06-10 11:37:47 -0500 |
| commit | b62cd318daaa3d94c150d87dc2c8466b9463cef5 (patch) | |
| tree | 2e196a8f9a9e51d32d0749c938b3f09492f8c222 /slirp/tftp.c | |
| parent | 97f31cbc71fc13b3091893313a555c3cf1ecb798 (diff) | |
| parent | 9914fbedf21f1ffd45af67c8f3fe8a2e8f7e7785 (diff) | |
| download | qemu-b62cd318daaa3d94c150d87dc2c8466b9463cef5.tar.gz qemu-b62cd318daaa3d94c150d87dc2c8466b9463cef5.tar.bz2 qemu-b62cd318daaa3d94c150d87dc2c8466b9463cef5.zip | |
Merge remote-tracking branch 'luiz/queue/qmp' into staging
# By Luiz Capitulino (2) and Marcelo Tosatti (1)
# Via Luiz Capitulino
* luiz/queue/qmp:
correct RTC_CHANGE_EVENT description (v2)
MAINTAINERS: split Monitor (QMP/HMP) entry
MAINTAINERS: new maintainers for qapi-schema.json
Message-id: 1370634855-18337-1-git-send-email-lcapitulino@redhat.com
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
Diffstat (limited to 'slirp/tftp.c')
0 files changed, 0 insertions, 0 deletions