tree 64b465237bc73c603ffe4bc0f7d53cfdd7751e7d
parent c9c217977a97452aea54740c2b49e919f3c66b8d
parent 5b500f974ba1701436ec0e4743c802c0651a3f4f
author Avi Kivity <avi@redhat.com> 1286966641 +0200
committer Avi Kivity <avi@redhat.com> 1286966684 +0200

Merge commit '5b500f974ba1701436ec0e4743c802c0651a3f4f' into upstream-merge

* commit '5b500f974ba1701436ec0e4743c802c0651a3f4f':
  Add qemu_ram_alloc_from_ptr function

Conflicts:
	cpu-common.h
	exec.c

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