| commit | c7a4a96cec202a6f2188c7eccab4527edca914e1 | |
| author | Stefan Weil <sw@weilnetz.de> | |
| Thu, 19 Nov 2015 07:12:14 +0000 (19 08:12 +0100) | ||
| committer | Stefan Weil <sw@weilnetz.de> | |
| Thu, 19 Nov 2015 07:12:14 +0000 (19 08:12 +0100) | ||
| tree | e9333d726664d11f390687128249705f9f78d39a | treesnapshot (tar.gz zip) |
| parent | 7dc662a82703f55c54a296da749c06391e295f45 | commitdiff |
| parent | 8f280309030331a912fd8924c129d8bd59e1bdc7 | commitdiff |
Merge remote-tracking branch 'qemu/master'
Conflicts:
Makefile
Signed-off-by: Stefan Weil <sw@weilnetz.de>
Conflicts:
Makefile
Signed-off-by: Stefan Weil <sw@weilnetz.de>
| target-i386/cpu.c | diff1 | diff2 | blobhistory |
| target-i386/translate.c | diff1 | diff2 | blobhistory |