| commit | 146c9891e48027b75da0d73c1534ac1810e32066 | |
| author | Marcelo Tosatti <mtosatti@redhat.com> | |
| Wed, 22 Jun 2011 22:46:36 +0000 (22 19:46 -0300) | ||
| committer | Marcelo Tosatti <mtosatti@redhat.com> | |
| Wed, 22 Jun 2011 22:46:36 +0000 (22 19:46 -0300) | ||
| tree | bcb052a83a6319817620ce00751f2c9b316f7b6e | treesnapshot (tar.gz zip) |
| parent | a4203fbdb891324f4bf91016af8d4bbb144a92e5 | commitdiff |
| parent | 01731cfb39ae234a8df852f56fc21efd155dbc26 | commitdiff |
Merge commit '01731cfb39ae234a8df852f56fc21efd155dbc26' into upstream-merge
* commit '01731cfb39ae234a8df852f56fc21efd155dbc26':
msix: Use replace local defines with pci_regs versions
pci: Update pci_regs header
Conflicts:
hw/msix.c
Signed-off-by: Marcelo Tosatti <mtosatti@redhat.com>
* commit '01731cfb39ae234a8df852f56fc21efd155dbc26':
msix: Use replace local defines with pci_regs versions
pci: Update pci_regs header
Conflicts:
hw/msix.c
Signed-off-by: Marcelo Tosatti <mtosatti@redhat.com>
| hw/msix.c | diff1 | diff2 | blobhistory |
| hw/pci_regs.h | diff1 | diff2 | blobhistory |
| hw/pcie_aer.c | diff1 | diff2 | blobhistory |