Merge tag 'hax-v5-pull-request'
commit7e273a9143f022c5e065633c55bf0fda064374a3
authorStefan Weil <sw@weilnetz.de>
Mon, 19 Dec 2016 17:16:38 +0000 (19 18:16 +0100)
committerStefan Weil <sw@weilnetz.de>
Mon, 19 Dec 2016 17:16:38 +0000 (19 18:16 +0100)
treee90ef3c42e86db5b1169fd4225f0e80bb22fe6f2
parenta7115d7f03de506d7bba14ac740d353ca3e97c09
parentbc2fa770d55e472477bcd5fef1524a2c5314d7f0
Merge tag 'hax-v5-pull-request'

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

Signed-off-by: Stefan Weil <sw@weilnetz.de>