| commit | a08858010b78108155a27c890cfe5a6a63e01b35 | |
| author | Stefan Weil <sw@weilnetz.de> | |
| Wed, 16 Mar 2016 20:44:58 +0000 (16 21:44 +0100) | ||
| committer | Stefan Weil <sw@weilnetz.de> | |
| Wed, 16 Mar 2016 20:44:58 +0000 (16 21:44 +0100) | ||
| tree | bae68442b52ddc06371602fa888302f9c38fd960 | treesnapshot (tar.gz zip) |
| parent | 00767ed6e3fa213890a6c8caed63cfa4d49aa729 | commitdiff |
| parent | d1f8764099022bc1173f2413331b26d4ff609a0c | commitdiff |
Merge remote-tracking branch 'qemu/master'
Conflicts:
hw/arm/bcm2835_peripherals.c
hw/arm/raspi.c
hw/char/bcm2835_aux.c
hw/misc/bcm2835_property.c
hw/ppc/spapr.c
util/error.c
Signed-off-by: Stefan Weil <sw@weilnetz.de>
Conflicts:
hw/arm/bcm2835_peripherals.c
hw/arm/raspi.c
hw/char/bcm2835_aux.c
hw/misc/bcm2835_property.c
hw/ppc/spapr.c
util/error.c
Signed-off-by: Stefan Weil <sw@weilnetz.de>
14 files changed: