Merge remote-tracking branch 'qemu/master'
commitc5d1d900f0062eb017e33a390148d63236bc5c99
authorStefan Weil <sw@weilnetz.de>
Fri, 7 Nov 2014 06:33:42 +0000 (7 07:33 +0100)
committerStefan Weil <sw@weilnetz.de>
Fri, 7 Nov 2014 06:33:42 +0000 (7 07:33 +0100)
treefd309789365020ba2f99d99fa2305ebb6442432c
parentb4a305f389a5b1e5566607678cefa960d93c11dc
parent6e76d125f244e10676b917208f2a074729820246
Merge remote-tracking branch 'qemu/master'

Conflicts:
include/hw/boards.h
target-arm/translate.c
target-mips/op_helper.c

Signed-off-by: Stefan Weil <sw@weilnetz.de>
38 files changed:
MAINTAINERS
block/Makefile.objs
configure
hw/arm/boot.c
hw/m68k/mcf5208.c
hw/pci/pci.c
hw/ppc/spapr.c
hw/scsi/megasas.c
include/block/block_int.h
include/hw/boards.h
include/hw/pci/pci_ids.h
include/qemu-common.h
linux-user/elfload.c
linux-user/main.c
memory.c
monitor.c
os-win32.c
qemu-img-cmds.hx
qemu-img.c
qemu-options.hx
rules.mak
target-arm/cpu.c
target-arm/cpu.h
target-arm/translate-a64.c
target-arm/translate.c
target-i386/cpu.c
target-i386/cpu.h
target-i386/translate.c
target-mips/cpu.h
target-mips/helper.c
target-mips/machine.c
target-mips/op_helper.c
target-ppc/translate.c
target-ppc/translate_init.c
trace-events
ui/Makefile.objs
ui/gtk.c
vl.c