]> git.proxmox.com Git - qemu.git/commit
Merge remote-tracking branch 'afaerber-or/prep-up' into staging
authorAnthony Liguori <aliguori@us.ibm.com>
Wed, 30 Jan 2013 16:48:23 +0000 (10:48 -0600)
committerAnthony Liguori <aliguori@us.ibm.com>
Wed, 30 Jan 2013 16:48:23 +0000 (10:48 -0600)
commit7cc2a8b14a363777e7d5b7d102176fba0cf27667
tree5d0d5684ddd1c8a715bbfb38b9bf865a1e3b9d95
parent6ac5107dc7045f2edc43ada2cb3f18d372b9be0b
parent75610155562bd480356a7a5018e5de4c44ec7884
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