| commit | d34e871e01ca6b457a8e0f9a8d5112aed0d2afc5 | |
| author | Stefan Weil <sw@weilnetz.de> | |
| Mon, 16 May 2016 10:05:33 +0000 (16 12:05 +0200) | ||
| committer | Stefan Weil <sw@weilnetz.de> | |
| Mon, 16 May 2016 10:05:33 +0000 (16 12:05 +0200) | ||
| tree | 14d78b67d6b32fabc5d9d91b510adb5703e06eed | treesnapshot (tar.gz zip) |
| parent | 0b638234b2c9d20426b7888ed44d73a6a8a49a45 | commitdiff |
| parent | 70f87e0f0aa04f764dabaeb3ed71ff195748076a | commitdiff |
Merge remote-tracking branch 'qemu/master'
Conflicts:
configure
hw/arm/armv7m.c
hw/usb/host-libusb.c
translate-all.c
Signed-off-by: Stefan Weil <sw@weilnetz.de>
Conflicts:
configure
hw/arm/armv7m.c
hw/usb/host-libusb.c
translate-all.c
Signed-off-by: Stefan Weil <sw@weilnetz.de>
30 files changed: