Merge remote-tracking branch 'qemu/master'
commit62b1487292575fed637e2b106e2fc762b308dbc8
authorStefan Weil <sw@weilnetz.de>
Mon, 1 Sep 2014 19:08:42 +0000 (1 21:08 +0200)
committerStefan Weil <sw@weilnetz.de>
Mon, 1 Sep 2014 19:08:42 +0000 (1 21:08 +0200)
treee047178de63d398d60a249c59161bb61b7eb7535
parent8c584bec23d4e7aa2a5c45d6d8c4bc1480b97195
parent88e89a57f985296a6eeb416b2a875072e09d7faa
Merge remote-tracking branch 'qemu/master'
MAINTAINERS
async.c
block.c
block/Makefile.objs
configure
cpu-exec.c
cpus.c
include/block/block_int.h
qemu-img.c
qemu-options.hx