Merge remote-tracking branch 'qemu/master'
commit05f6c531d0e3049059553e9684df7058289b9eb7
authorStefan Weil <sw@weilnetz.de>
Mon, 23 May 2016 19:35:54 +0000 (23 21:35 +0200)
committerStefan Weil <sw@weilnetz.de>
Mon, 23 May 2016 19:35:54 +0000 (23 21:35 +0200)
treed7a449c4123c0450eaf273af98360a7ff42e5486
parentb93545540fc928d95aa2b9241ed5f77318df73da
parentc9158547617584bb9d19db7fb139998fbef80133
Merge remote-tracking branch 'qemu/master'

Conflicts:
hw/display/vga.c
hw/usb/Makefile.objs
include/qemu-common.h
linux-user/main.c

+ API updates.

Signed-off-by: Stefan Weil <sw@weilnetz.de>
81 files changed:
Makefile
block/vhdx.c
bsd-user/main.c
bsd-user/qemu.h
configure
cpus.c
exec.c
hw/arm/bast.c
hw/arm/bcm2835.c
hw/arm/phycard-l.c
hw/arm/s3c2410x.c
hw/arm/s3c2440.c
hw/arm/s3c24xx_clkcon.c
hw/arm/s3c24xx_gpio.c
hw/arm/s3c24xx_iic.c
hw/arm/s3c24xx_irq.c
hw/arm/s3c24xx_lcd.c
hw/arm/s3c24xx_memc.c
hw/arm/s3c24xx_nand.c
hw/arm/s3c24xx_rtc.c
hw/arm/s3c24xx_serial.c
hw/arm/s3c24xx_timers.c
hw/arm/syborg.c
hw/bt/sdp.c
hw/display/pl110.c
hw/display/vga.c
hw/mips/ar7.c
hw/mips/cputimer.c
hw/mips/mips_malta.c
hw/mips/mips_r4k.c
hw/misc/bcm2835_mphi.c
hw/misc/bcm2835_power.c
hw/ppc/prep.c
hw/sh4/sh7750.c
hw/timer/bcm2835_st.c
hw/timer/bcm2835_timer.c
hw/usb/Makefile.objs
hw/usb/bcm2835_usb.c
include/block/block_int.h
include/exec/cpu-all.h
include/exec/exec-all.h
include/hw/arm/arm.h
include/qemu-common.h
include/qom/cpu.h
linux-user/main.c
linux-user/qemu.h
memory.c
migration/savevm.c
monitor.c
qemu-io.c
target-alpha/mem_helper.c
target-arm/cpu.c
target-arm/cpu.h
target-arm/helper.c
target-arm/op_helper.c
target-arm/translate.c
target-cris/cpu.h
target-cris/op_helper.c
target-cris/translate.c
target-i386/cpu.h
target-i386/kvm.c
target-i386/misc_helper.c
target-i386/seg_helper.c
target-i386/svm_helper.c
target-i386/translate.c
target-m68k/op_helper.c
target-m68k/translate.c
target-microblaze/mmu.c
target-microblaze/op_helper.c
target-mips/cpu.h
target-mips/helper.c
target-mips/op_helper.c
target-ppc/excp_helper.c
target-ppc/translate_init.c
target-sh4/op_helper.c
tcg/tcg.c
tcg/tcg.h
tests/ide-test.c
translate-all.c
user-exec.c
vl.c