Public Git Hosting - qemu/ar7.git/commit

summary | log | graphiclog1 | graphiclog2 | commit | commitdiff | tree | refs | edit | fork
(merge: 97f0bdd 4c24f40)

commit	8ae86c9503c9b4a6f1bb800d3b9723cbcd011f0a
author	Stefan Weil <sw@weilnetz.de>
	Fri, 12 Sep 2014 17:22:31 +0000 (12 19:22 +0200)
committer	Stefan Weil <sw@weilnetz.de>
	Fri, 12 Sep 2014 17:22:31 +0000 (12 19:22 +0200)
tree	5624930128bed2d289b6a6889984890b204351ba	tree \| snapshot (tar.gz zip)
parent	97f0bdd2e11719086cdb6587fa540e70be025459	commit \| diff
parent	4c24f4004089a308c5de8ed720cf6bd1746aedd8	commit \| diff

Merge remote-tracking branch 'qemu/master'

Conflicts:
hw/arm/boot.c

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

16 files changed:

cpu-exec.c	diff1 \|	diff2 \|	blob \| history
exec.c	diff1 \|	diff2 \|	blob \| history
hw/arm/boot.c	diff1 \|	diff2 \|	blob \| history
hw/display/vga.c	diff1 \|	diff2 \|	blob \| history
hw/display/xenfb.c	diff1 \|	diff2 \|	blob \| history
include/exec/exec-all.h	diff1 \|	diff2 \|	blob \| history
include/qom/cpu.h	diff1 \|	diff2 \|	blob \| history
linux-user/main.c	diff1 \|	diff2 \|	blob \| history
target-arm/cpu.c	diff1 \|	diff2 \|	blob \| history
target-arm/cpu.h	diff1 \|	diff2 \|	blob \| history
target-arm/helper.c	diff1 \|	diff2 \|	blob \| history
target-arm/op_helper.c	diff1 \|	diff2 \|	blob \| history
target-i386/cpu.c	diff1 \|	diff2 \|	blob \| history
target-i386/cpu.h	diff1 \|	diff2 \|	blob \| history
trace-events	diff1 \|	diff2 \|	blob \| history
ui/console.c	diff1 \|	diff2 \|	blob \| history

AR7 emulation for QEMU