From: Peter Maydell <peter.maydell@linaro.org>
Date: Mon, 27 Apr 2015 16:28:41 +0000 (+0100)
Subject: Merge remote-tracking branch 'remotes/qmp-unstable/tags/for-upstream' into staging
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=0d81cdddaa40a1988b24657aeac19959cfad0fde;p=qemu.git

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>
---

0d81cdddaa40a1988b24657aeac19959cfad0fde