| commit | cb5676c70962b564ea5fafc4cf833639ac128ca0 | |
| author | Stefan Weil <sw@weilnetz.de> | |
| Mon, 21 Mar 2016 19:39:42 +0000 (21 20:39 +0100) | ||
| committer | Stefan Weil <sw@weilnetz.de> | |
| Mon, 21 Mar 2016 19:39:42 +0000 (21 20:39 +0100) | ||
| tree | 6e770d17349393cca46b29b980a640df9d93134e | treesnapshot (tar.gz zip) |
| parent | 9c0e5c7ee3d72ab2ac2128a0e287571a21612cbe | commitdiff |
| parent | 6bacb6e49a22469ac5ab516ecae9c5476b95da9c | commitdiff |
Merge remote-tracking branch '0xabu/raspi'
Conflicts:
hw/arm/bcm2835_peripherals.c
hw/arm/raspi.c
hw/char/bcm2835_aux.c
hw/misc/bcm2835_property.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
Signed-off-by: Stefan Weil <sw@weilnetz.de>