commit | 9bf6c77d931c41cacef1a81ea5cd5bde529d0a4e | [log] [tgz] |
---|---|---|
author | Avi Kivity <avi@redhat.com> | Wed Oct 13 12:44:01 2010 +0200 |
committer | Avi Kivity <avi@redhat.com> | Wed Oct 13 12:44:44 2010 +0200 |
tree | 64b465237bc73c603ffe4bc0f7d53cfdd7751e7d | |
parent | c9c217977a97452aea54740c2b49e919f3c66b8d [diff] | |
parent | 5b500f974ba1701436ec0e4743c802c0651a3f4f [diff] |
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>