Merge commit '13f5545daa8b4d12221bc69287c6a5d87962e115' into upstream-merge
commit7312a154e9c132571004cba003e6e43b4afc88f1
authorAvi Kivity <avi@redhat.com>
Thu, 10 Sep 2009 09:34:06 +0000 (10 12:34 +0300)
committerAvi Kivity <avi@redhat.com>
Thu, 10 Sep 2009 09:34:06 +0000 (10 12:34 +0300)
tree891be08471e89338394c6aa6ad5be79093f93431
parenta01fbdc361ba95b6489e4feb341f57d8075e8d84
parent13f5545daa8b4d12221bc69287c6a5d87962e115
Merge commit '13f5545daa8b4d12221bc69287c6a5d87962e115' into upstream-merge

* commit '13f5545daa8b4d12221bc69287c6a5d87962e115':
  Fix VMSTATE_PCI_DEVICE version
  don't call cpu_sychronize_state from reset handlers
  RTC polling mode broken

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