Merge remote-tracking branch 'qemu/master'
commitec62c4ab490644bc54c6763422e79458d0209947
authorStefan Weil <sw@weilnetz.de>
Mon, 22 Aug 2016 15:28:55 +0000 (22 17:28 +0200)
committerStefan Weil <sw@weilnetz.de>
Mon, 22 Aug 2016 15:28:55 +0000 (22 17:28 +0200)
treeca22815cc164555cb8e05243be663468c5bfb53e
parentd104eeb9d9c86a7a3973e53609fb8a5532759a0b
parentd75aa4372f0414c9960534026a562b0302fcff29
Merge remote-tracking branch 'qemu/master'
include/block/block_int.h
linux-user/syscall.c