| commit | 92be34e4b5073c4e1285b3fc9fbf3af46fccb353 | |
| author | Stefan Weil <sw@weilnetz.de> | |
| Fri, 27 Jan 2017 17:33:40 +0000 (27 18:33 +0100) | ||
| committer | Stefan Weil <sw@weilnetz.de> | |
| Fri, 27 Jan 2017 17:33:40 +0000 (27 18:33 +0100) | ||
| tree | 3be14c6ed58728138e8908fad635f108b2cca4c7 | treesnapshot (tar.gz zip) |
| parent | 788d11aa2cb3f1a8f2b8406aad3e7dd997a2e6fd | commitdiff |
| parent | 29ba0cdc1fd1300f910d150c03a0f74236083bf7 | commitdiff |
Merge remote-tracking branch 'qemu/master'
# Conflicts:
# linux-user/main.c
# vl.c
Signed-off-by: Stefan Weil <sw@weilnetz.de>
# Conflicts:
# linux-user/main.c
# vl.c
Signed-off-by: Stefan Weil <sw@weilnetz.de>
22 files changed: