]> git.ipfire.org Git - thirdparty/qemu.git/commit
Merge remote-tracking branch 'remotes/sstabellini/xen-140220' into staging
authorPeter Maydell <peter.maydell@linaro.org>
Mon, 24 Feb 2014 16:12:55 +0000 (16:12 +0000)
committerPeter Maydell <peter.maydell@linaro.org>
Mon, 24 Feb 2014 16:12:55 +0000 (16:12 +0000)
commitc58e291591dbc1c846fa152d4792554803405ebb
tree7ecea8fea0dda60ba8b702abd5d1d35dcca0ef5c
parent6dedf0522c3fdeb10fe27d4aef35f4c57f3d0806
parent58da5b1e01a586eb5a52ba3eec342d6828269839
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>