From: Anthony Liguori <aliguori@us.ibm.com>
Date: Tue, 10 Apr 2012 13:17:36 +0000 (-0500)
Subject: Merge remote-tracking branch 'qmp/queue/qmp' into staging
X-Git-Tag: v1.1-rc0~125
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=6da25bd5e8355230b9562417e386728c31783002;p=thirdparty%2Fqemu.git

Merge remote-tracking branch 'qmp/queue/qmp' into staging

* qmp/queue/qmp:
  qapi: convert device_del
  qdev: qdev_unplug(): use error_set()
---

6da25bd5e8355230b9562417e386728c31783002