Merge remote-tracking branch '0xabu/raspi'

Merge remote-tracking branch '0xabu/raspi'

Conflicts:
	hw/arm/Makefile.objs
	hw/arm/bcm2835.c
	hw/arm/bcm2835_peripherals.c
	hw/arm/bcm2836.c
	hw/arm/raspi.c
	hw/char/bcm2835_aux.c
	hw/display/bcm2835_fb.c
	hw/dma/bcm2835_dma.c
	hw/misc/Makefile.objs
	hw/misc/bcm2835_mphi.c
	hw/misc/bcm2835_power.c
	hw/misc/bcm2835_property.c
	hw/timer/bcm2835_st.c
	hw/timer/bcm2835_timer.c
	hw/usb/bcm2835_usb.c
	include/hw/arm/bcm2835_peripherals.h
	include/hw/char/bcm2835_aux.h
	include/hw/display/bcm2835_fb.h
	include/hw/dma/bcm2835_dma.h
	include/hw/misc/bcm2835_mphi.h
	include/hw/misc/bcm2835_power.h

Signed-off-by: Stefan Weil <sw@weilnetz.de>