Public Git Hosting - qemu/ar7.git/commit

commit	0ed7b5728473117e8159e3105c8c6545763f7b8a
author	Stefan Weil <sw@weilnetz.de>
	Sun, 26 Oct 2014 12:14:36 +0000 (26 13:14 +0100)
committer	Stefan Weil <sw@weilnetz.de>
	Sun, 26 Oct 2014 14:10:25 +0000 (26 15:10 +0100)
tree	3fccb1acc50af43af4724504fc04d35a2b505ba6	tree \| snapshot (tar.gz zip)
parent	b10b5251b3955cc0ae416a518da88206e4e1431f	commit \| diff
parent	6de4e7fdf6c7c53bc3769a88b628ab7610bb6698	commit \| diff

Merge remote-tracking branch 'qemu/master'

Conflicts:
hw/arm/musicpal.c
hw/mips/mips_r4k.c

+ API fixes.

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

25 files changed:

MAINTAINERS	diff1 \|	diff2 \|	blob \| history
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
hw/arm/bast.c	diff1 \|	\|	blob \| history
hw/arm/musicpal.c	diff1 \|	diff2 \|	blob \| history
hw/block/pflash.c	diff1 \|	\|	blob \| history
hw/block/pflash.h	diff1 \|	\|	blob \| history
hw/mips/ar7.c	diff1 \|	\|	blob \| history
hw/mips/mips_malta.c	diff1 \|	diff2 \|	blob \| history
hw/mips/mips_r4k.c	diff1 \|	diff2 \|	blob \| history
hw/ppc/ppc405_boards.c	diff1 \|	diff2 \|	blob \| history
hw/ppc/prep.c	diff1 \|	diff2 \|	blob \| history
hw/ppc/spapr.c	diff1 \|	diff2 \|	blob \| history
hw/scsi/megasas.c	diff1 \|	diff2 \|	blob \| history
hw/sd/bcm2835_emmc.c	diff1 \|	\|	blob \| history
include/block/block_int.h	diff1 \|	diff2 \|	blob \| history
monitor.c	diff1 \|	diff2 \|	blob \| history
qemu-img.c	diff1 \|	diff2 \|	blob \| history
qemu-io.c	diff1 \|	diff2 \|	blob \| history
target-mips/cpu.h	diff1 \|	diff2 \|	blob \| history
target-mips/op_helper.c	diff1 \|	diff2 \|	blob \| history
trace-events	diff1 \|	diff2 \|	blob \| history
ui/gtk.c	diff1 \|	diff2 \|	blob \| history

AR7 emulation for QEMU

RSS Atom

MAINTAINERS	diff1 \|	diff2 \|	blob \| history
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
hw/arm/bast.c	diff1 \|	\|	blob \| history
hw/arm/musicpal.c	diff1 \|	diff2 \|	blob \| history
hw/block/pflash.c	diff1 \|	\|	blob \| history
hw/block/pflash.h	diff1 \|	\|	blob \| history
hw/mips/ar7.c	diff1 \|	\|	blob \| history
hw/mips/mips_malta.c	diff1 \|	diff2 \|	blob \| history
hw/mips/mips_r4k.c	diff1 \|	diff2 \|	blob \| history
hw/ppc/ppc405_boards.c	diff1 \|	diff2 \|	blob \| history
hw/ppc/prep.c	diff1 \|	diff2 \|	blob \| history
hw/ppc/spapr.c	diff1 \|	diff2 \|	blob \| history
hw/scsi/megasas.c	diff1 \|	diff2 \|	blob \| history
hw/sd/bcm2835_emmc.c	diff1 \|	\|	blob \| history
include/block/block_int.h	diff1 \|	diff2 \|	blob \| history
monitor.c	diff1 \|	diff2 \|	blob \| history
qemu-img.c	diff1 \|	diff2 \|	blob \| history
qemu-io.c	diff1 \|	diff2 \|	blob \| history
target-mips/cpu.h	diff1 \|	diff2 \|	blob \| history
target-mips/op_helper.c	diff1 \|	diff2 \|	blob \| history
trace-events	diff1 \|	diff2 \|	blob \| history
ui/gtk.c	diff1 \|	diff2 \|	blob \| history