Merge remote-tracking branch 'remotes/qmp-unstable/tags/for-upstream' into staging
commit1430500bb8ba0bf15bad235439d62276c1b6b22f
authorPeter Maydell <peter.maydell@linaro.org>
Thu, 23 Oct 2014 16:05:15 +0000 (23 17:05 +0100)
committerPeter Maydell <peter.maydell@linaro.org>
Thu, 23 Oct 2014 16:05:15 +0000 (23 17:05 +0100)
tree12e69462ce386b5b2076adcf15a9229516502b92
parente40830afa1cff3ffdc37bdfdd40d80860074636c
parente799157c766d96506214059d8b75712a3e615431
Merge remote-tracking branch 'remotes/qmp-unstable/tags/for-upstream' into staging

QMP patches

# gpg: Signature made Thu 23 Oct 2014 16:05:52 BST using RSA key ID E24ED5A7
# gpg: Good signature from "Luiz Capitulino <lcapitulino@gmail.com>"

* remotes/qmp-unstable/tags/for-upstream:
  monitor: delete device_del_bus_completion
  monitor: add del completion for peripheral device
  qdev: add qdev_build_hotpluggable_device_list helper
  MAINTAINERS: add entry for qobject files
  dump: Turn some functions to void to make code cleaner
  dump: Propagate errors into qmp_dump_guest_memory()
  virtio-balloon: Tweak recent fix for integer overflow

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>