* qemu-kvm/uq/master:
  kvm-stub: fix compilation
  kvm: shorten the parameter list for get_real_device()
  kvm: i386: fix LAPIC TSC deadline timer save/restore
  kvm-all.c: max_cpus should not exceed KVM vcpu limit
  kvm: Simplify kvm_handle_io
  kvm: x86: fix setting IA32_FEATURE_CONTROL with nested VMX disabled
  kvm: add KVM_IRQFD_FLAG_RESAMPLE support
  kvm: migrate vPMU state
  target-i386: remove tabs from target-i386/cpu.h
  Initialize IA32_FEATURE_CONTROL MSR in reset and migration
Conflicts:
	target-i386/cpu.h
	target-i386/kvm.c
aliguori: fixup trivial conflicts due to whitespace and added cpu
          argument
Signed-off-by: Anthony Liguori <anthony@codemonkey.ws>
						
					
				
			 | 
			||
|---|---|---|
| .. | ||
| dataplane | ||
| Makefile.objs | ||
| vhost.c | ||
| virtio-balloon.c | ||
| virtio-bus.c | ||
| virtio-mmio.c | ||
| virtio-pci.c | ||
| virtio-pci.h | ||
| virtio-rng.c | ||
| virtio.c | ||