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

…

empty_slot.c

…

fw-path-provider.c

…

generic-loader.c

…

hotplug.c

…

irq.c

…

loader-fit.c

…

loader.c

…

machine.c

…

Makefile.objs

…

nmi.c

…

null-machine.c

…

or-irq.c

…

platform-bus.c

…

ptimer.c

…

qdev-properties-system.c

…

qdev-properties.c

…

qdev.c

…

register.c

…

reset.c

…

stream.c

…

sysbus.c

…

uboot_image.h

…