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

…

i82378.c

…

isa-bus.c

…

lpc_ich9.c

…

Makefile.objs

…

pc87312.c

…

piix4.c

…

trace-events

…

vt82c686.c

…