| commit | c0363c1f2c74198ec6a7cbd137a8466810ed890f | |
| author | Stefan Weil <sw@weilnetz.de> | |
| Fri, 4 Dec 2015 06:35:20 +0000 (4 07:35 +0100) | ||
| committer | Stefan Weil <sw@weilnetz.de> | |
| Fri, 4 Dec 2015 06:35:20 +0000 (4 07:35 +0100) | ||
| tree | 905c100d902b10ac71f630a48b3a9c62aa1e6226 | treesnapshot (tar.gz zip) |
| parent | 81c1f3b7ba939f941e33d5781ff4e0e04bda80af | commitdiff |
| parent | e9707a9c6e9c3730d4f66a4f083183c82cf04c05 | commitdiff |
Merge remote-tracking branch '0xabu/raspi'
Conflicts:
hw/arm/Makefile.objs
hw/arm/raspi.c
hw/display/bcm2835_fb.c
hw/dma/bcm2835_dma.c
hw/intc/Makefile.objs
hw/intc/bcm2835_ic.c
hw/misc/bcm2835_mphi.c
hw/misc/bcm2835_power.c
hw/misc/bcm2835_property.c
hw/misc/bcm2835_sbm.c
hw/misc/bcm2835_vchiq.c
hw/sd/bcm2835_emmc.c
hw/timer/bcm2835_st.c
hw/timer/bcm2835_timer.c
hw/usb/bcm2835_usb.c
include/hw/arm/bcm2835_arm_control.h
Signed-off-by: Stefan Weil <sw@weilnetz.de>
Conflicts:
hw/arm/Makefile.objs
hw/arm/raspi.c
hw/display/bcm2835_fb.c
hw/dma/bcm2835_dma.c
hw/intc/Makefile.objs
hw/intc/bcm2835_ic.c
hw/misc/bcm2835_mphi.c
hw/misc/bcm2835_power.c
hw/misc/bcm2835_property.c
hw/misc/bcm2835_sbm.c
hw/misc/bcm2835_vchiq.c
hw/sd/bcm2835_emmc.c
hw/timer/bcm2835_st.c
hw/timer/bcm2835_timer.c
hw/usb/bcm2835_usb.c
include/hw/arm/bcm2835_arm_control.h
Signed-off-by: Stefan Weil <sw@weilnetz.de>