Michael S. Tsirkin acc95bc850 Merge remote-tracking branch 'origin/master' into HEAD ...

Resolve conflicts around apb.

Signed-off-by: Michael S. Tsirkin <mst@redhat.com>

2018-01-11 22:03:50 +02:00

..

bus.c

hmp-commands: Remove the deprecated usb_add and usb_del

2017-12-14 10:16:52 +00:00

ccid-card-emulated.c

…

ccid-card-passthru.c

usb: Use angle brackets for cacard include directive

2017-09-29 12:28:26 +02:00

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

usb-hub: use DIV_ROUND_UP

2017-08-31 12:29:07 +02:00

dev-mtp.c

…

dev-network.c

…

dev-serial.c

…

dev-smartcard-reader.c

usb-ccid: remove needless migration state code

2017-10-23 10:05:28 +02:00

dev-storage.c

dev-storage: Fix the unusual function name

2017-12-19 10:25:08 +00:00

dev-uas.c

scsi: move block/scsi.h to include/scsi/constants.h

2017-09-19 14:09:31 +02:00

dev-wacom.c

…

hcd-ehci-pci.c

pci: Add INTERFACE_CONVENTIONAL_PCI_DEVICE to Conventional PCI devices

2017-10-15 05:54:43 +03:00

hcd-ehci-sysbus.c

ehci: Add ppc4xx-ehci for the USB 2.0 controller in embedded PPC SoCs

2017-09-27 13:05:41 +10:00

hcd-ehci.c

migration: pre_save return int

2017-09-27 11:35:59 +01:00

hcd-ehci.h

ehci: Add ppc4xx-ehci for the USB 2.0 controller in embedded PPC SoCs

2017-09-27 13:05:41 +10:00

hcd-musb.c

…

hcd-ohci.c

pci: Add INTERFACE_CONVENTIONAL_PCI_DEVICE to Conventional PCI devices

2017-10-15 05:54:43 +03:00

hcd-uhci.c

pci: Add INTERFACE_CONVENTIONAL_PCI_DEVICE to Conventional PCI devices

2017-10-15 05:54:43 +03:00

hcd-xhci-nec.c

…

hcd-xhci.c

pci: Eliminate redundant PCIDevice::bus pointer

2017-12-05 19:13:45 +02:00

hcd-xhci.h

…

host-legacy.c

…

host-libusb.c

…

host-stub.c

…

host.h

…

libhw.c

…

Makefile.objs

usb: fix host-stub.c build race

2017-10-05 11:03:25 +02:00

quirks-ftdi-ids.h

…

quirks-pl2303-ids.h

…

quirks.c

…

quirks.h

…

redirect.c

migration: pre_save return int

2017-09-27 11:35:59 +01:00

trace-events

trace-events: fix code style: print 0x before hex numbers

2017-08-01 12:13:07 +01:00

tusb6010.c

…

xen-usb.c

…