From: Peter Maydell <peter.maydell@linaro.org>
Date: Mon, 24 Feb 2014 16:12:55 +0000 (+0000)
Subject: Merge remote-tracking branch 'remotes/sstabellini/xen-140220' into staging
X-Git-Tag: TizenStudio_2.0_p2.3.2~208^2~1050
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=c58e291591dbc1c846fa152d4792554803405ebb;p=sdk%2Femulator%2Fqemu.git

Merge remote-tracking branch 'remotes/sstabellini/xen-140220' into staging

* remotes/sstabellini/xen-140220:
  xen_disk: fix io accounting
  Call pci_piix3_xen_ide_unplug from unplug_disks

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

c58e291591dbc1c846fa152d4792554803405ebb