]> git.proxmox.com Git - mirror_qemu.git/commitdiff
Merge remote-tracking branch 'qemu-kvm/uq/master' into staging
authorAnthony Liguori <aliguori@amazon.com>
Thu, 21 Nov 2013 15:09:52 +0000 (07:09 -0800)
committerAnthony Liguori <aliguori@amazon.com>
Thu, 21 Nov 2013 15:09:52 +0000 (07:09 -0800)
# By Jan Kiszka (1) and others
# Via Gleb Natapov
* qemu-kvm/uq/master:
  kvm: Fix uninitialized cpuid_data
  pci-assign: Remove dead code for direct I/O region access from userspace
  KVM: x86: fix typo in KVM_GET_XCRS

Message-id: cover.1385040432.git.gleb@redhat.com
Signed-off-by: Anthony Liguori <aliguori@amazon.com>
1  2 
hw/i386/kvm/pci-assign.c

Simple merge