diff options
author | Anthony Liguori <aliguori@us.ibm.com> | 2012-01-23 10:58:02 -0600 |
---|---|---|
committer | Anthony Liguori <aliguori@us.ibm.com> | 2012-01-23 10:58:02 -0600 |
commit | c4ccbeaca521bdbf5cb8db37dc67c47e1add0586 (patch) | |
tree | 110cb400e402af772a78495ce58d4715f617e0f4 /MAINTAINERS | |
parent | 65f82df0d7a71ce1b10cd4c5ab08888d176ac840 (diff) | |
parent | 506b7ddf889312659b36c667f7ae17bc9e909418 (diff) |
Merge remote-tracking branch 'afaerber/prep-up' into staging
* 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
Diffstat (limited to 'MAINTAINERS')
-rw-r--r-- | MAINTAINERS | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index 87237a6f3c..73c0a10006 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -315,6 +315,7 @@ M: Andreas Färber <andreas.faerber@web.de> L: qemu-ppc@nongnu.org S: Odd Fixes F: hw/ppc_prep.c +F: hw/prep_pci.[hc] SH4 Machines ------------ |