]> git.proxmox.com Git - qemu.git/commitdiff
Merge remote-tracking branch 'qemu-kvm/memory/urgent' into staging
authorAnthony Liguori <aliguori@us.ibm.com>
Mon, 22 Oct 2012 19:49:18 +0000 (14:49 -0500)
committerAnthony Liguori <aliguori@us.ibm.com>
Mon, 22 Oct 2012 19:49:18 +0000 (14:49 -0500)
* qemu-kvm/memory/urgent:
  memory: abort if a memory region is destroyed during a transaction
  i440fx: avoid destroying memory regions within a transaction
  memory: Make eventfd adhere to device endianness

1  2 
memory.c

diff --cc memory.c
Simple merge