Merge tag 'hax-v6-pull-request'
commit2c172b4ff6b32950d8446bd8801bbcd33359d144
authorStefan Weil <sw@weilnetz.de>
Tue, 10 Jan 2017 22:10:05 +0000 (10 23:10 +0100)
committerStefan Weil <sw@weilnetz.de>
Wed, 11 Jan 2017 14:09:21 +0000 (11 15:09 +0100)
tree818ca8354a53f96a792630d7d987fbde02dca78d
parentd9ee7941725add083764bb1795ae4b6b919f4a73
parent81b85c3032da902e73e77302af508b4b1a7c0ead
Merge tag 'hax-v6-pull-request'

# Conflicts:
# cpus.c
# target/i386/hax-all.c
# target/i386/hax-i386.h
# target/i386/hax-mem.c

Signed-off-by: Stefan Weil <sw@weilnetz.de>
cpus.c
exec.c
include/exec/memory.h
target/m68k/translate.c
xen-mapcache.c