From: Anthony Liguori <aliguori@us.ibm.com>
Date: Wed, 28 Nov 2012 19:19:06 +0000 (-0600)
Subject: Merge remote-tracking branch 'agraf/ppc-for-upstream-1.3' into staging
X-Git-Tag: qemu-xen-4.3.0-rc1~17^2~19
X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=7e68494b0be4310c48996e9334373ef5771e3d15;p=qemu-upstream-4.6-testing.git

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

* agraf/ppc-for-upstream-1.3:
  fbdev: fix pixman compile on old pixman
  vl.c: Fix broken -usb option
  pseries: Fix bug in PCI MSI allocation
  kvm: fix incorrect length in a loop over kvm dirty pages map
  PPC: Fix missing TRACE exception
  hw/ide/macio: Fix segfault caused by NULL DMAContext*

Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
---

7e68494b0be4310c48996e9334373ef5771e3d15