projects / qemu.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (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)
* 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>

Trivial merge
Unnamed repository; edit this file 'description' to name the repository.