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

Remove/replace sysemu/char.h inclusion

2017-06-02 11:33:52 +04:00

ccid-card-passthru.c

usb: Use angle brackets for cacard include directive

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

ccid.h

usb: Change *_exitfn return type from int to void

2016-10-28 18:17:23 +03:00

combined-packet.c

usb: Clean up includes

2016-01-29 15:07:23 +00:00

core.c

usb: don't wakeup during coldplug

2017-05-29 14:18:09 +02:00

desc-msos.c

usb: Clean up includes

2016-01-29 15:07:23 +00:00

desc.c

usb: accept usb3 control requests

2017-02-06 10:23:17 +01:00

desc.h

all: Clean up includes

2016-02-23 12:43:05 +00:00

dev-audio.c

usb: replace handle_destroy with unrealize

2017-02-23 15:40:19 +01:00

dev-bluetooth.c

usb: replace handle_destroy with unrealize

2017-02-23 15:40:19 +01:00

dev-hid.c

usb: replace handle_destroy with unrealize

2017-02-23 15:40:19 +01:00

dev-hub.c

usb-hub: use DIV_ROUND_UP

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

dev-mtp.c

usb: Set category and description of the MTP device

2017-01-24 23:26:54 +03:00

dev-network.c

usb: replace handle_destroy with unrealize

2017-02-23 15:40:19 +01:00

dev-serial.c

char: avoid chardevice direct access

2017-07-14 11:04:33 +02:00

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

usb: replace handle_destroy with unrealize

2017-02-23 15:40:19 +01:00

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

Replaced get_tick_per_sec() by NANOSECONDS_PER_SECOND

2016-03-22 22:20:17 +01:00

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

xhci: split into multiple files

2017-05-29 14:03:35 +02:00

hcd-xhci.c

pci: Eliminate redundant PCIDevice::bus pointer

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

hcd-xhci.h

xhci: split into multiple files

2017-05-29 14:03:35 +02:00

host-legacy.c

usb: Clean up includes

2016-01-29 15:07:23 +00:00

host-libusb.c

usb-host: support devices with sparse/non-sequential USB interfaces

2017-06-21 15:30:08 +02:00

host-stub.c

hw/ppc/spapr: Fix boot path of usb-host storage devices

2017-01-31 10:10:13 +11:00

host.h

usb-host: move legacy cmd line bits

2013-02-19 12:30:05 +01:00

libhw.c

usb: Clean up includes

2016-01-29 15:07:23 +00:00

Makefile.objs

usb: fix host-stub.c build race

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

quirks-ftdi-ids.h

usbredir: Add support for buffered bulk input (v2)

2013-01-08 10:56:58 +01:00

quirks-pl2303-ids.h

usbredir: Add support for buffered bulk input (v2)

2013-01-08 10:56:58 +01:00

quirks.c

usb: Clean up includes

2016-01-29 15:07:23 +00:00

quirks.h

usbredir: Add support for buffered bulk input (v2)

2013-01-08 10:56:58 +01:00

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

Replaced get_tick_per_sec() by NANOSECONDS_PER_SECOND

2016-03-22 22:20:17 +01:00

xen-usb.c

qapi: merge QInt and QFloat in QNum

2017-06-20 14:31:31 +02:00