From: Anthony Liguori <aliguori@us.ibm.com>
Date: Mon, 23 Jan 2012 16:58:02 +0000 (-0600)
Subject: Merge remote-tracking branch 'afaerber/prep-up' into staging
X-Git-Tag: TizenStudio_2.0_p2.3.2~208^2~4674
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=c4ccbeaca521bdbf5cb8db37dc67c47e1add0586;p=sdk%2Femulator%2Fqemu.git

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
---

c4ccbeaca521bdbf5cb8db37dc67c47e1add0586
diff --cc MAINTAINERS
index 87237a6,148f0d2..73c0a10
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@@ -312,9 -305,9 +312,10 @@@ F: hw/grackle_pci.
  
  PReP
  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
  ------------