Merge remote-tracking branch 'qemu-kvm/uq/master' into staging
authorAnthony Liguori <aliguori@amazon.com>
Sat, 7 Dec 2013 15:35:25 +0000 (07:35 -0800)
committerAnthony Liguori <aliguori@amazon.com>
Sat, 7 Dec 2013 15:35:25 +0000 (07:35 -0800)
# By Alex Williamson (1) and others
# Via Paolo Bonzini
* qemu-kvm/uq/master:
  target-i386: fix cpuid leaf 0x0d
  qemu: mempath: prefault pages manually (v4)
  kvm: Query KVM for available memory slots

Message-id: 1386345276-9803-1-git-send-email-pbonzini@redhat.com
Signed-off-by: Anthony Liguori <aliguori@amazon.com>
1  2 
vl.c

diff --cc vl.c
Simple merge