| commit | 4b6cacdc5fb897cbc771e15e5b3799784916605e | |
| author | Marcelo Tosatti <mtosatti@redhat.com> | |
| Tue, 23 Aug 2011 12:49:11 +0000 (23 09:49 -0300) | ||
| committer | Marcelo Tosatti <mtosatti@redhat.com> | |
| Tue, 23 Aug 2011 12:49:11 +0000 (23 09:49 -0300) | ||
| tree | f0baffbaed44301a460df55de4ef7fec63f5b930 | treesnapshot (tar.gz zip) |
| parent | 73218e984e5b16a7e1aa5b8054e9c886e093967d | commitdiff |
| parent | 7267c0947d7e8ae5dff7bafd932c3bc285f43e5c | commitdiff |
Merge commit '7267c0947d7e8ae5dff7bafd932c3bc285f43e5c' into upstream-merge
* commit '7267c0947d7e8ae5dff7bafd932c3bc285f43e5c':
Use glib memory allocation and free functions
Conflicts:
hw/msix.c
hw/pci.c
Signed-off-by: Marcelo Tosatti <mtosatti@redhat.com>
* commit '7267c0947d7e8ae5dff7bafd932c3bc285f43e5c':
Use glib memory allocation and free functions
Conflicts:
hw/msix.c
hw/pci.c
Signed-off-by: Marcelo Tosatti <mtosatti@redhat.com>
14 files changed: