| commit | 52dae16d41e1712ffc1236e5a972e496dfbe8cfa | |
| author | Marcelo Tosatti <mtosatti@redhat.com> | |
| Tue, 23 Aug 2011 13:49:58 +0000 (23 10:49 -0300) | ||
| committer | Marcelo Tosatti <mtosatti@redhat.com> | |
| Tue, 23 Aug 2011 13:49:58 +0000 (23 10:49 -0300) | ||
| tree | 931f5977262fd8ab535b0c1826997890124df64b | treesnapshot (tar.gz zip) |
| parent | 1f6d370eb14b3fa3f02d557874a04e12711ff2e5 | commitdiff |
| parent | ae0a54664c76f1d2a2a7a268266d47b4e8c12a4c | commitdiff |
Merge commit 'ae0a54664c76f1d2a2a7a268266d47b4e8c12a4c' into upstream-merge
* commit 'ae0a54664c76f1d2a2a7a268266d47b4e8c12a4c':
440fx: fix PAM, PCI holes
vga: drop get_system_memory() from vga devices and derivatives
Conflicts:
hw/piix_pci.c
Signed-off-by: Marcelo Tosatti <mtosatti@redhat.com>
* commit 'ae0a54664c76f1d2a2a7a268266d47b4e8c12a4c':
440fx: fix PAM, PCI holes
vga: drop get_system_memory() from vga devices and derivatives
Conflicts:
hw/piix_pci.c
Signed-off-by: Marcelo Tosatti <mtosatti@redhat.com>