Public Git Hosting - qemu/ar7.git/commit

summary | log | graphiclog1 | graphiclog2 | commit | commitdiff | tree | refs | edit | fork
(merge: d4b056e 1b16240)

commit	50ee4c45a5bd4431c54673bd6767b51b372eba08
author	Andrew Baumann <Andrew.Baumann@microsoft.com>
	Tue, 23 Feb 2016 23:35:12 +0000 (23 15:35 -0800)
committer	Andrew Baumann <Andrew.Baumann@microsoft.com>
	Tue, 23 Feb 2016 23:35:12 +0000 (23 15:35 -0800)
tree	a8cd14f13a1b5c94e16e7e7b611b99b12910201d	tree \| snapshot (tar.gz zip)
parent	d4b056e5ee5830175dfcad0e6180a23f2d8c789b	commit \| diff
parent	1b1624092d1f1f746adea6e1237a07f6788c2e3d	commit \| diff

Merge branch 'master' into raspi (including upstream raspi patches)

14 files changed:

hw/arm/bcm2835_peripherals.c	diff1 \|	diff2 \|	blob \| history
hw/arm/bcm2836.c	diff1 \|	diff2 \|	blob \| history
hw/arm/raspi.c	diff1 \|	diff2 \|	blob \| history
hw/intc/bcm2835_ic.c	diff1 \|	diff2 \|	blob \| history
hw/intc/bcm2836_control.c	diff1 \|	diff2 \|	blob \| history
hw/misc/bcm2835_mbox.c	diff1 \|	diff2 \|	blob \| history
hw/misc/bcm2835_property.c	diff1 \|	diff2 \|	blob \| history
hw/sd/sd.c	diff1 \|	diff2 \|	blob \| history
hw/sd/sdhci.c	diff1 \|	diff2 \|	blob \| history
hw/timer/Makefile.objs	diff1 \|	diff2 \|	blob \| history
hw/usb/Makefile.objs	diff1 \|	diff2 \|	blob \| history
include/hw/misc/bcm2835_property.h	diff1 \|	diff2 \|	blob \| history
include/hw/sd/sdhci.h	diff1 \|	diff2 \|	blob \| history
target-arm/op_helper.c	diff1 \|	diff2 \|	blob \| history

AR7 emulation for QEMU