xenbits.xensource.com Git - qemu-xen-4.6-testing.git/commit

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

author	Anthony Liguori <aliguori@us.ibm.com>
	Mon, 23 Jan 2012 16:58:02 +0000 (10:58 -0600)
committer	Anthony Liguori <aliguori@us.ibm.com>
	Mon, 23 Jan 2012 16:58:02 +0000 (10:58 -0600)
commit	c4ccbeaca521bdbf5cb8db37dc67c47e1add0586
tree	110cb400e402af772a78495ce58d4715f617e0f4	tree
parent	65f82df0d7a71ce1b10cd4c5ab08888d176ac840	commit \| diff
parent	506b7ddf889312659b36c667f7ae17bc9e909418	commit \| diff

MAINTAINERS	diff1 \|	diff2 \|	blob \| history
default-configs/ppc-softmmu.mak	diff1 \|	diff2 \|	blob \| history