]> git.proxmox.com Git - mirror_qemu.git/commitdiff
Merge remote-tracking branch 'qemu-kvm/memory/urgent' into staging
authorAnthony Liguori <aliguori@us.ibm.com>
Thu, 1 Mar 2012 21:26:55 +0000 (15:26 -0600)
committerAnthony Liguori <aliguori@us.ibm.com>
Thu, 1 Mar 2012 21:26:55 +0000 (15:26 -0600)
* qemu-kvm/memory/urgent:
  kvm: fix unaligned slots

1  2 
kvm-all.c

diff --cc kvm-all.c
Simple merge