]> git.proxmox.com Git - qemu.git/commitdiff
projects / qemu.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 6ac5107 7561015)
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)
# 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


Trivial merge
Qemu copy for testing