Merge remote-tracking branch 'qemu-kvm/uq/master' into staging
authorAnthony Liguori <aliguori@us.ibm.com>
Wed, 2 Jan 2013 14:01:54 +0000 (08:01 -0600)
committerAnthony Liguori <aliguori@us.ibm.com>
Wed, 2 Jan 2013 14:01:54 +0000 (08:01 -0600)
* qemu-kvm/uq/master:
  qemu-kvm/pci-assign: 64 bits bar emulation
  target-i386: Enabling IA32_TSC_ADJUST for QEMU KVM guest VMs

Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
1  2 
hw/kvm/pci-assign.c
target-i386/cpu.h
target-i386/kvm.c
target-i386/machine.c

Simple merge
Simple merge
Simple merge
Simple merge