acc95bc850
Resolve conflicts around apb. Signed-off-by: Michael S. Tsirkin <mst@redhat.com> |
||
---|---|---|
.. | ||
dec.c | ||
dec.h | ||
gen_pcie_root_port.c | ||
i82801b11.c | ||
ioh3420.c | ||
ioh3420.h | ||
Makefile.objs | ||
pci_bridge_dev.c | ||
pci_expander_bridge.c | ||
pcie_pci_bridge.c | ||
pcie_root_port.c | ||
xio3130_downstream.c | ||
xio3130_downstream.h | ||
xio3130_upstream.c | ||
xio3130_upstream.h |