Merge remote-tracking branch 'qemu-kvm/uq/master' into staging

* 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>

diff --cc hw/kvm/pci-assign.c
Simple merge

diff --cc target-i386/cpu.h
Simple merge

diff --cc target-i386/kvm.c
Simple merge

diff --cc target-i386/machine.c
Simple merge