| commit | c3ae4e1c2438a965d6c5a7c907cf559202ca9fb7 | |
| author | Stefan Weil <sw@weilnetz.de> | |
| Fri, 16 Mar 2018 20:20:29 +0000 (16 21:20 +0100) | ||
| committer | Stefan Weil <sw@weilnetz.de> | |
| Tue, 20 Mar 2018 21:33:47 +0000 (20 22:33 +0100) | ||
| tree | fed773cfb3820da07da116311b97c41be3a73dbf | treesnapshot (tar.gz zip) |
| parent | e1379491f8c945ed325befb41945ea1b282a8249 | commitdiff |
| parent | 2bb39a657abeac3f33ab3298177fb27c35f5b50a | commitdiff |
Merge remote-tracking branch 'qemu/master'
# Conflicts:
# hw/arm/Makefile.objs
# hw/arm/raspi.c
# hw/mips/mips_malta.c
# hw/pci/pci.c
# linux-user/qemu.h
Signed-off-by: Stefan Weil <sw@weilnetz.de>
# Conflicts:
# hw/arm/Makefile.objs
# hw/arm/raspi.c
# hw/mips/mips_malta.c
# hw/pci/pci.c
# linux-user/qemu.h
Signed-off-by: Stefan Weil <sw@weilnetz.de>
66 files changed: