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

..

apb.h

sun4u: split IOMMU device out from apb.c to sun4u_iommu.c

2018-01-09 21:48:20 +00:00

gpex.h

hw/pci-host/gpex: Set INTx index/gsi mapping

2017-09-14 18:43:18 +01:00

pam.h

hw/i386: remove smram_update

2015-06-05 17:36:39 +02:00

ppce500.h

Clean up header guards that don't match their file name

2016-07-12 16:19:16 +02:00

q35.h

hw/pci-host: Fix x86 Host Bridges 64bit PCI hole

2017-11-16 17:46:53 +02:00

spapr.h

spapr: introduce a spapr_qirq() helper

2017-12-15 09:49:24 +11:00

xilinx-pcie.h

pci: Move bridge data structures from pci_bus.h to pci_bridge.h

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