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

..

Makefile.objs

…

trace-events

…

xen_apic.c

…

xen_platform.c

Merge remote-tracking branch 'origin/master' into HEAD

2018-01-11 22:03:50 +02:00

xen_pvdevice.c

…

xen-hvm.c

xen: Log errno rather than return value

2017-10-26 14:26:48 -07:00

xen-mapcache.c

mmap(2) returns MAP_FAILED, not NULL, on failure

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