From: Anthony Liguori <aliguori@us.ibm.com>
Date: Wed, 30 Jan 2013 16:48:23 +0000 (-0600)
Subject: Merge remote-tracking branch 'afaerber-or/prep-up' into staging
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=7cc2a8b14a363777e7d5b7d102176fba0cf27667;p=qemu.git

Merge remote-tracking branch 'afaerber-or/prep-up' into staging

# By Andreas Färber
# Via Andreas Färber
* afaerber-or/prep-up:
  prep: Move PReP machine to hw/ppc/
  prep_pci: Convert to QOM realizefn
  prep_pci: Create PCIBus and PCIDevice in-place
---

7cc2a8b14a363777e7d5b7d102176fba0cf27667