| commit | 0bd1f6b1b20a7a882663201b6e5351a01202331a | |
| author | Stefan Weil <sw@weilnetz.de> | |
| Tue, 31 Jan 2017 09:55:45 +0000 (31 10:55 +0100) | ||
| committer | Stefan Weil <sw@weilnetz.de> | |
| Tue, 31 Jan 2017 14:14:04 +0000 (31 15:14 +0100) | ||
| tree | 967d7d1b1bd10ec777b9cb6d522bbaa9b7a954a2 | treesnapshot (tar.gz zip) |
| parent | a3a71110145fa23e05007807977556a4b0769263 | commitdiff |
| parent | a0def594286d9110a6035e02eef558cf3cf5d847 | commitdiff |
Merge remote-tracking branch 'qemu/master'
# Conflicts:
# hw/mips/mips_malta.c
Signed-off-by: Stefan Weil <sw@weilnetz.de>
# Conflicts:
# hw/mips/mips_malta.c
Signed-off-by: Stefan Weil <sw@weilnetz.de>
27 files changed: