From: Anthony Liguori <aliguori@us.ibm.com>
Date: Wed, 15 Aug 2012 19:59:21 +0000 (-0500)
Subject: Merge remote-tracking branch 'agraf/ppc-for-upstream' into staging
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=0d16fdd732d1b211842fa96b7c90ddf9e6bde0e4;p=qemu.git

Merge remote-tracking branch 'agraf/ppc-for-upstream' into staging

* agraf/ppc-for-upstream: (24 commits)
  openpic: Added BRR1 register
  pseries: Update SLOF firmware image
  pseries dma: DMA window params added to PHB and DT population changed
  pseries: Add PCI MSI/MSI-X support
  pseries: Add trace event for PCI irqs
  pseries: Export find_phb() utility function for PCI code
  pseries: added allocator for a block of IRQs
  pseries: Separate PCI RTAS setup from common from emulation specific PCI setup
  pseries: Rework irq assignment to avoid carrying qemu_irqs around
  pseries: Remove extraneous prints
  pseries: Update SLOF
  PPC: spapr: Remove global variable
  PPC: spapr: Rework VGA select logic
  xbzrle: fix compilation on ppc32
  spapr: Add support for -vga option
  Add one new file vga-pci.h and cleanup on all platforms
  Revert "PPC: e500: Use new MPIC dt format"
  ppc: Fix bug in handling of PAPR hypercall exits
  PPC: e500: add generic e500 platform
  PPC: e500: split mpc8544ds machine from generic e500 code
  ...
---

0d16fdd732d1b211842fa96b7c90ddf9e6bde0e4