Merge commit '94fb0909645de18481cc726ee0ec9b5afa861394' into upstream-merge
commit9b01912e15e2dc2f1f128075fe3617c7f1010d6e
authorMarcelo Tosatti <mtosatti@redhat.com>
Mon, 14 Sep 2009 11:03:09 +0000 (14 08:03 -0300)
committerMarcelo Tosatti <mtosatti@redhat.com>
Mon, 14 Sep 2009 11:03:09 +0000 (14 08:03 -0300)
tree4c9a24243cff50957bd4f08935b2b4386c583400
parent8ee4a93637fd50121edbe2d50ae965da2fcfa949
parent94fb0909645de18481cc726ee0ec9b5afa861394
Merge commit '94fb0909645de18481cc726ee0ec9b5afa861394' into upstream-merge

* commit '94fb0909645de18481cc726ee0ec9b5afa861394':
  ram: Remove SaveVM Version 2 support

Conflicts:
vl.c

Signed-off-by: Marcelo Tosatti <mtosatti@redhat.com>
vl.c