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

..

amd-xgbe.c

…

calxeda-xgmac.c

…

ccw.c

hw: use "qemu/osdep.h" as first #include in source files

2017-12-18 17:07:02 +03:00

common.c

vfio/spapr: Allow fallback to SPAPR TCE IOMMU v1

2017-12-13 10:19:33 -07:00

Makefile.objs

…

pci-quirks.c

…

pci.c

…

pci.h

vfio-pci: Remove unused fields from VFIOMSIXInfo

2017-12-13 10:19:34 -07:00

platform.c

…

spapr.c

…

trace-events

…