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

fw_cfg: add write callback

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

machine.c

misc: remove duplicated includes

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

Makefile.objs

…

nmi.c

…

null-machine.c

…

or-irq.c

…

platform-bus.c

…

ptimer.c

…

qdev-properties-system.c

Pull request

2017-12-20 11:30:55 +00:00

qdev-properties.c

qdev-properties: add UUID property type

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

qdev.c

qdev: defer DEVICE_DEL event until instance_finalize()

2017-10-18 10:34:50 +02:00

register.c

…

reset.c

…

stream.c

…

sysbus.c

…

uboot_image.h

…