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

..

apm.c

hw: Clean up includes

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

i82378.c

hw/timer/mc146818: rename rtc_init() -> mc146818_rtc_init()

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

isa-bus.c

isabus-bridge: Remove user_creatable flag

2017-05-17 10:37:01 -03:00

lpc_ich9.c

pci: Eliminate redundant PCIDevice::bus pointer

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

Makefile.objs

Allow ISA bus to be configured out

2017-02-06 12:33:21 +11:00

pc87312.c

hw/isa/pc87312: Mark the device with user_creatable = false

2017-09-26 09:11:23 +03:00

piix4.c

pci: Add INTERFACE_CONVENTIONAL_PCI_DEVICE to Conventional PCI devices

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

trace-events

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

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

vt82c686.c

misc: remove old i386 dependency

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