acc95bc850
Resolve conflicts around apb. Signed-off-by: Michael S. Tsirkin <mst@redhat.com> |
||
---|---|---|
.. | ||
bus.c | ||
ccid-card-emulated.c | ||
ccid-card-passthru.c | ||
ccid.h | ||
combined-packet.c | ||
core.c | ||
desc-msos.c | ||
desc.c | ||
desc.h | ||
dev-audio.c | ||
dev-bluetooth.c | ||
dev-hid.c | ||
dev-hub.c | ||
dev-mtp.c | ||
dev-network.c | ||
dev-serial.c | ||
dev-smartcard-reader.c | ||
dev-storage.c | ||
dev-uas.c | ||
dev-wacom.c | ||
hcd-ehci-pci.c | ||
hcd-ehci-sysbus.c | ||
hcd-ehci.c | ||
hcd-ehci.h | ||
hcd-musb.c | ||
hcd-ohci.c | ||
hcd-uhci.c | ||
hcd-xhci-nec.c | ||
hcd-xhci.c | ||
hcd-xhci.h | ||
host-legacy.c | ||
host-libusb.c | ||
host-stub.c | ||
host.h | ||
libhw.c | ||
Makefile.objs | ||
quirks-ftdi-ids.h | ||
quirks-pl2303-ids.h | ||
quirks.c | ||
quirks.h | ||
redirect.c | ||
trace-events | ||
tusb6010.c | ||
xen-usb.c |