| commit | fe83cfe7db41a889aa95651750da4d5d9723e853 | |
| author | Marcelo Tosatti <mtosatti@redhat.com> | |
| Wed, 20 Oct 2010 23:19:46 +0000 (20 21:19 -0200) | ||
| committer | Marcelo Tosatti <mtosatti@redhat.com> | |
| Wed, 20 Oct 2010 23:19:46 +0000 (20 21:19 -0200) | ||
| tree | 3c514c80205ddb520f74cc3a878ed84908218646 | treesnapshot (tar.gz zip) |
| parent | 250968666b4984f5f6e91bd3358f21187aea8ad8 | commitdiff |
| parent | e890261f671a0573efbc024972d8769423fc82fc | commitdiff |
Merge commit 'e890261f671a0573efbc024972d8769423fc82fc' into upstream-merge
* commit 'e890261f671a0573efbc024972d8769423fc82fc':
Export qemu_ram_addr_from_host
Conflicts:
cpu-common.h
exec.c
Signed-off-by: Marcelo Tosatti <mtosatti@redhat.com>
* commit 'e890261f671a0573efbc024972d8769423fc82fc':
Export qemu_ram_addr_from_host
Conflicts:
cpu-common.h
exec.c
Signed-off-by: Marcelo Tosatti <mtosatti@redhat.com>
| cpu-common.h | diff1 | diff2 | blobhistory |
| exec.c | diff1 | diff2 | blobhistory |
| qemu-kvm.c | diff1 | blobhistory |