tree 82d512568e98edd86c7433be61f567bdf6a693f8
parent 079944e695589364d19de31f27761c6bdea1c207
parent 0a2a59d35cbabf63c91340a1c62038e3e60538c1
author Anthony Liguori <aliguori@us.ibm.com> 1357135314 -0600
committer Anthony Liguori <aliguori@us.ibm.com> 1357135314 -0600

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>