diff options
author | Peter Maydell <peter.maydell@linaro.org> | 2015-04-27 17:28:41 +0100 |
---|---|---|
committer | Peter Maydell <peter.maydell@linaro.org> | 2015-04-27 17:28:41 +0100 |
commit | 0d81cdddaa40a1988b24657aeac19959cfad0fde (patch) | |
tree | 2c41f3347b5cfac69d1cf8c5d2ce7f161a4d225e /MAINTAINERS | |
parent | e1a5476354d396773e4c555f126d752d4ae58fa9 (diff) | |
parent | 2d5a8346a484250934526a15b3a522bdba7e6772 (diff) |
Merge remote-tracking branch 'remotes/qmp-unstable/tags/for-upstream' into staging
Four little fixes
# gpg: Signature made Fri Apr 24 19:56:51 2015 BST using RSA key ID E24ED5A7
# gpg: Good signature from "Luiz Capitulino <lcapitulino@gmail.com>"
* remotes/qmp-unstable/tags/for-upstream:
qmp: Give saner messages related to qmp_capabilities misuse
qmp-commands: fix incorrect uses of ":O" specifier
qapi: Drop dead genlist parameter
balloon: improve error msg when adding second device
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'MAINTAINERS')
0 files changed, 0 insertions, 0 deletions