Merge commit '8d2ba1fb9c8e7006e10d71fa51a020977f14c8b0' into upstream-merge
commit255af6f10b822e41e8cebb13e598c24c6b536164
authorAvi Kivity <avi@redhat.com>
Tue, 30 Jun 2009 11:58:06 +0000 (30 14:58 +0300)
committerAvi Kivity <avi@redhat.com>
Tue, 30 Jun 2009 11:58:06 +0000 (30 14:58 +0300)
tree3579dea775c702e13df5edaaa68d00e30e7148d7
parentf21dd80aea0fff462ca0708977626ef0c05b81c9
parent8d2ba1fb9c8e7006e10d71fa51a020977f14c8b0
Merge commit '8d2ba1fb9c8e7006e10d71fa51a020977f14c8b0' into upstream-merge

* commit '8d2ba1fb9c8e7006e10d71fa51a020977f14c8b0':
  kvm: Rework VCPU synchronization

Conflicts:
hw/apic.c

Signed-off-by: Avi Kivity <avi@redhat.com>
hw/apic.c
kvm.h
vl.c