| commit | 732e6f6bbc5c444756d5c33563ebd008c1e13cec | |
| author | Marcelo Tosatti <mtosatti@redhat.com> | |
| Thu, 7 Jan 2010 19:34:57 +0000 (7 17:34 -0200) | ||
| committer | Marcelo Tosatti <mtosatti@redhat.com> | |
| Thu, 7 Jan 2010 19:34:57 +0000 (7 17:34 -0200) | ||
| tree | eb78d9f79d003f4bccdd60758c0fc45795dbf238 | treesnapshot (tar.gz zip) |
| parent | 4cb092b434a7a9623218f6e18f8b7ce7c53f9799 | commitdiff |
| parent | f2c688bb4264039a351ada7323d0ebb546c3a1a5 | commitdiff |
Merge commit 'f2c688bb4264039a351ada7323d0ebb546c3a1a5' into upstream-merge
* commit 'f2c688bb4264039a351ada7323d0ebb546c3a1a5':
piix_pci: define symbolic value for PAM0, PAM6 and SMRAM.
msix: use range helper function.
acpi: use range helper function.
gt64xxx: remove gt64120_{read, write}_config().
Conflicts:
hw/piix_pci.c
Signed-off-by: Marcelo Tosatti <mtosatti@redhat.com>
* commit 'f2c688bb4264039a351ada7323d0ebb546c3a1a5':
piix_pci: define symbolic value for PAM0, PAM6 and SMRAM.
msix: use range helper function.
acpi: use range helper function.
gt64xxx: remove gt64120_{read, write}_config().
Conflicts:
hw/piix_pci.c
Signed-off-by: Marcelo Tosatti <mtosatti@redhat.com>
| hw/acpi.c | diff1 | diff2 | blobhistory |
| hw/msix.c | diff1 | diff2 | blobhistory |
| hw/piix_pci.c | diff1 | diff2 | blobhistory |