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

..

alpha_sys.h

…

dp264.c

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

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

Makefile.objs

…

pci.c

…

trace-events

…

typhoon.c

…