Public Git Hosting - qemu/ar7.git/commit

summary | log | graphiclog1 | graphiclog2 | commit | commitdiff | tree | refs | edit | fork
(merge: cb5676c 490dda0)

commit	0e46184997a29a3c226bd80891574b02363904ce
author	Stefan Weil <sw@weilnetz.de>
	Thu, 24 Mar 2016 16:13:17 +0000 (24 17:13 +0100)
committer	Stefan Weil <sw@weilnetz.de>
	Thu, 24 Mar 2016 16:13:17 +0000 (24 17:13 +0100)
tree	538d18b75a2ba0fec10b0752e0e663a54a2c5378	tree \| snapshot (tar.gz zip)
parent	cb5676c70962b564ea5fafc4cf833639ac128ca0	commit \| diff
parent	490dda053e3324c97b28439813fab4c2f362183e	commit \| diff

Merge remote-tracking branch 'qemu/master'

Conflicts:
default-configs/mips-softmmu.mak
default-configs/mipsel-softmmu.mak

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

default-configs/mips-softmmu-common.mak	diff1 \|	diff2 \|	blob \| history
default-configs/pci.mak	diff1 \|	diff2 \|	blob \| history
qemu-doc.texi	diff1 \|	diff2 \|	blob \| history
target-mips/cpu.h	diff1 \|	diff2 \|	blob \| history
target-ppc/translate_init.c	diff1 \|	diff2 \|	blob \| history

AR7 emulation for QEMU