| commit | 5953739822d8cc08c9e3d0dbd317448f569c2b9f | |
| author | Marcelo Tosatti <mtosatti@redhat.com> | |
| Wed, 22 Jun 2011 19:56:36 +0000 (22 16:56 -0300) | ||
| committer | Marcelo Tosatti <mtosatti@redhat.com> | |
| Wed, 22 Jun 2011 19:56:36 +0000 (22 16:56 -0300) | ||
| tree | 45237cc883f0cb2a6edc6d466206180fbd7b09d3 | treesnapshot (tar.gz zip) |
| parent | 3a469eab28446bbc70d7470d8878c1dd469c07cc | commitdiff |
| parent | 113f89df42479924380cad562ab86fd2c8e2d11b | commitdiff |
Merge commit '113f89df42479924380cad562ab86fd2c8e2d11b' into upstream-merge
* commit '113f89df42479924380cad562ab86fd2c8e2d11b':
pci: move ids of config space into PCIDeviceInfo
CPUPhysMemoryClient: batch addresses in catchup
ich/ahci: fix uninitialized memory use
Conflicts:
hw/pci.c
Signed-off-by: Marcelo Tosatti <mtosatti@redhat.com>
* commit '113f89df42479924380cad562ab86fd2c8e2d11b':
pci: move ids of config space into PCIDeviceInfo
CPUPhysMemoryClient: batch addresses in catchup
ich/ahci: fix uninitialized memory use
Conflicts:
hw/pci.c
Signed-off-by: Marcelo Tosatti <mtosatti@redhat.com>
| exec.c | diff1 | diff2 | blobhistory |
| hw/ide/ich.c | diff1 | diff2 | blobhistory |
| hw/pci.c | diff1 | diff2 | blobhistory |
| hw/pci.h | diff1 | diff2 | blobhistory |