Merge commit '46dbef6adefad2cc6fc6690faacb5c22dbd8f6f9' into upstream-merge
commit06a01deed6ebdd499d26cea2d9bf5527537d5980
authorMarcelo Tosatti <mtosatti@redhat.com>
Wed, 17 Feb 2010 05:13:15 +0000 (17 03:13 -0200)
committerMarcelo Tosatti <mtosatti@redhat.com>
Wed, 17 Feb 2010 05:13:15 +0000 (17 03:13 -0200)
tree162e5a589a51324c97af54f8faac733f5f1e9ca1
parentb500a09840502663b5849ef4e96a665ceff48c16
parent46dbef6adefad2cc6fc6690faacb5c22dbd8f6f9
Merge commit '46dbef6adefad2cc6fc6690faacb5c22dbd8f6f9' into upstream-merge

* commit '46dbef6adefad2cc6fc6690faacb5c22dbd8f6f9':
  kvm: move kvm_set_phys_mem around

Conflicts:
kvm-all.c

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