Merge remote-tracking branch 'qemu/master'
commit232a62d58763b93c822269913e498f21df166b9c
authorStefan Weil <sw@weilnetz.de>
Tue, 24 Mar 2015 22:22:55 +0000 (24 23:22 +0100)
committerStefan Weil <sw@weilnetz.de>
Tue, 24 Mar 2015 22:22:55 +0000 (24 23:22 +0100)
tree4db4fbb792ce2d853364e71570be92d92fd5c3ab
parenta9daec1da2bd9b38fe5a93105a39f25ccb9f106d
parent054903a832b865eb5432d79b5c9d1e1ff31b58d7
Merge remote-tracking branch 'qemu/master'
linux-user/main.c
linux-user/syscall.c