Merge remote-tracking branch 'qemu/master'
commitfb77e9e5e1b6f9f256df3a5be0f7a50f119d68f1
authorStefan Weil <sw@weilnetz.de>
Thu, 4 Sep 2014 17:45:20 +0000 (4 19:45 +0200)
committerStefan Weil <sw@weilnetz.de>
Thu, 4 Sep 2014 17:45:20 +0000 (4 19:45 +0200)
tree643a19560444651e859b3348d62836be5a711454
parent62b1487292575fed637e2b106e2fc762b308dbc8
parent8cf8c92e7775b9c5e811c55c9b8814168c46c34b
Merge remote-tracking branch 'qemu/master'
MAINTAINERS
exec.c
hw/pci/pci.c
include/hw/boards.h
qemu-options.hx
qom/object.c
vl.c