Public Git Hosting - qemu/ar7.git/commit

summary | log | graphiclog1 | graphiclog2 | commit | commitdiff | tree | refs | edit | fork
(merge: f6c9ac9 f2bcdc8)

commit	6f9023d85f81103df85de23929816db6a14a4800
author	Stefan Weil <sw@weilnetz.de>
	Mon, 15 Sep 2014 19:31:02 +0000 (15 21:31 +0200)
committer	Stefan Weil <sw@weilnetz.de>
	Mon, 15 Sep 2014 19:31:02 +0000 (15 21:31 +0200)
tree	4279bb70e39ce46337d5c297631c4a51ab37e3c5	tree \| snapshot (tar.gz zip)
parent	f6c9ac9edbe34245ba6b997c94d7937693720c37	commit \| diff
parent	f2bcdc8de018d33ecf93da7a94f327956ecf76ea	commit \| diff

Merge remote-tracking branch 'qemu/master'

Conflicts:
exec.c
pixman

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

23 files changed:

block/Makefile.objs	diff1 \|	diff2 \|	blob \| history
block/raw-win32.c	diff1 \|	diff2 \|	blob \| history
block/vhdx.c	diff1 \|	diff2 \|	blob \| history
configure	diff1 \|	diff2 \|	blob \| history
cpus.c	diff1 \|	diff2 \|	blob \| history
exec.c	diff1 \|	diff2 \|	blob \| history
hw/arm/armv7m.c	diff1 \|	diff2 \|	blob \| history
hw/arm/exynos4210.c	diff1 \|	diff2 \|	blob \| history
hw/arm/musicpal.c	diff1 \|	diff2 \|	blob \| history
hw/char/serial.c	diff1 \|	diff2 \|	blob \| history
hw/display/vga.c	diff1 \|	diff2 \|	blob \| history
hw/m68k/mcf5208.c	diff1 \|	diff2 \|	blob \| history
hw/mips/mips_malta.c	diff1 \|	diff2 \|	blob \| history
hw/mips/mips_r4k.c	diff1 \|	diff2 \|	blob \| history
hw/pci/pci.c	diff1 \|	diff2 \|	blob \| history
hw/ppc/ppc405_boards.c	diff1 \|	diff2 \|	blob \| history
include/block/block_int.h	diff1 \|	diff2 \|	blob \| history
include/qemu-common.h	diff1 \|	diff2 \|	blob \| history
memory.c	diff1 \|	diff2 \|	blob \| history
qemu-doc.texi	diff1 \|	diff2 \|	blob \| history
qemu-io.c	diff1 \|	diff2 \|	blob \| history
rules.mak	diff1 \|	diff2 \|	blob \| history
vl.c	diff1 \|	diff2 \|	blob \| history

AR7 emulation for QEMU