]> git.proxmox.com Git - mirror_qemu.git/commitdiff
Merge branch 'memory/core' of git://git.kernel.org/pub/scm/virt/kvm/qemu-kvm
authorBlue Swirl <blauwirbel@gmail.com>
Sun, 8 Apr 2012 18:00:42 +0000 (18:00 +0000)
committerBlue Swirl <blauwirbel@gmail.com>
Sun, 8 Apr 2012 18:00:42 +0000 (18:00 +0000)
* 'memory/core' of git://git.kernel.org/pub/scm/virt/kvm/qemu-kvm:
  memory: check address space when a listener is registered
  memory: print aliased IO ranges in info mtree
  ioport: use INT64_MAX for IO ranges


Trivial merge