]> git.proxmox.com Git - qemu.git/commit
projects / qemu.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: f3d44eb 6e72719)
Merge remote-tracking branch 'agraf/ppc-for-upstream-1.3' into staging
authorAnthony Liguori <aliguori@us.ibm.com>
Wed, 28 Nov 2012 19:19:06 +0000 (13:19 -0600)
committerAnthony Liguori <aliguori@us.ibm.com>
Wed, 28 Nov 2012 19:19:06 +0000 (13:19 -0600)
commit7e68494b0be4310c48996e9334373ef5771e3d15
treef9f24372cc2bd72f537142f143426765c9d794dbtree
parentf3d44eb53c10b4dddfb3762c3e005be38adfc0edcommit | diff
parent6e72719e721a40fe1224701ca10edc1caf0cd708commit | diff
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>
Qemu copy for testing