| commit | 628922f53c5f9934f1624f50480b4280d20ee36f | |
| author | Avi Kivity <avi@redhat.com> | |
| Tue, 30 Jun 2009 10:24:40 +0000 (30 13:24 +0300) | ||
| committer | Avi Kivity <avi@redhat.com> | |
| Tue, 30 Jun 2009 10:24:40 +0000 (30 13:24 +0300) | ||
| tree | 360c7a302813bf7379c90d183c89d5b23a583178 | treesnapshot (tar.gz zip) |
| parent | f7bc58c14fa07bcadc555629a431d34b8ab7802d | commitdiff |
| parent | c9e0df738918b1d5d39a283500abc3a3ac433f78 | commitdiff |
Merge commit 'c9e0df738918b1d5d39a283500abc3a3ac433f78' into upstream-merge
* commit 'c9e0df738918b1d5d39a283500abc3a3ac433f78':
Rename LIBOBJS to libobj-y
Rename OBJS to obj-y
cpu_unregister_map_client: fix memory leak.
Add documentation for Multiboot
Conflicts:
Makefile.target
Signed-off-by: Avi Kivity <avi@redhat.com>
* commit 'c9e0df738918b1d5d39a283500abc3a3ac433f78':
Rename LIBOBJS to libobj-y
Rename OBJS to obj-y
cpu_unregister_map_client: fix memory leak.
Add documentation for Multiboot
Conflicts:
Makefile.target
Signed-off-by: Avi Kivity <avi@redhat.com>
| Makefile.target | diff1 | diff2 | blobhistory |
| exec.c | diff1 | diff2 | blobhistory |
| qemu-options.hx | diff1 | diff2 | blobhistory |