Merge commit 'ff24bd589c657ad82ae0f151c4906f120a91f6f3' into upstream-merge
commitbc74516f0718dfec890ed7cbfc24cc52d099b590
authorAvi Kivity <avi@redhat.com>
Tue, 30 Jun 2009 09:45:27 +0000 (30 12:45 +0300)
committerAvi Kivity <avi@redhat.com>
Tue, 30 Jun 2009 09:45:27 +0000 (30 12:45 +0300)
tree3f42a9d50df08d7cb1f3d622a5db500466e0551b
parent6ed492e81732c6e9271920bdc925de0ae41e56c6
parentff24bd589c657ad82ae0f151c4906f120a91f6f3
Merge commit 'ff24bd589c657ad82ae0f151c4906f120a91f6f3' into upstream-merge

* commit 'ff24bd589c657ad82ae0f151c4906f120a91f6f3':
  qemu/virtio: virtio save/load bindings

Signed-off-by: Avi Kivity <avi@redhat.com>