]> Git Repo - qemu.git/commitdiff
Merge remote-tracking branch 'afaerber/prep-up' into staging
authorAnthony Liguori <[email protected]>
Mon, 23 Jan 2012 16:58:02 +0000 (10:58 -0600)
committerAnthony Liguori <[email protected]>
Mon, 23 Jan 2012 16:58:02 +0000 (10:58 -0600)
* afaerber/prep-up:
  prep: Use i82378 PCI->ISA bridge for 'prep' machine
  prep: Add i82378 PCI-to-ISA bridge emulation
  prep: Add i82374 DMA emulation
  MAINTAINERS: Add PCI host bridge files to PReP machine
  prep: qdev'ify Raven host bridge (SysBus)
  prep_pci: Update I/O to MemoryRegion ops
  prep_pci: Simplify I/O endianness
  prep: qdev'ify Raven host bridge (PCIDevice)
  prep: Use ISA m48t59
  prep: Fix offset of BIOS MemoryRegion

1  2 
MAINTAINERS
default-configs/ppc-softmmu.mak

diff --cc MAINTAINERS
index 87237a6f3c2e5fb8d0b0ad6504ba100f7d020992,148f0d2bc53907727dfe7134960c243eef61d3ab..73c0a1000667ed73d3323553a754b27e4fe0c135
@@@ -312,9 -305,9 +312,10 @@@ F: hw/grackle_pci.
  
  PReP
  M: Andreas Färber <[email protected]>
  S: Odd Fixes
  F: hw/ppc_prep.c
+ F: hw/prep_pci.[hc]
  
  SH4 Machines
  ------------
Simple merge
This page took 0.024577 seconds and 4 git commands to generate.