Merge remote-tracking branch 'qemu/master'
commite32e6021b95f19d126c139d03b44767c533c5b69
authorStefan Weil <sw@weilnetz.de>
Fri, 31 Oct 2014 16:10:34 +0000 (31 17:10 +0100)
committerStefan Weil <sw@weilnetz.de>
Fri, 31 Oct 2014 16:10:34 +0000 (31 17:10 +0100)
tree2c012378a3f39ab224cc18aa3a3ca7bf00160865
parentd4d135d72279f18d852aef2f917ab384d2917f14
parentee29498e4f0f3eff90eeeb7f5fa1703abedd2fb6
Merge remote-tracking branch 'qemu/master'
MAINTAINERS
qemu-options.hx
qom/object.c
scripts/get_maintainer.pl
target-i386/cpu.c
target-i386/cpu.h
target-i386/kvm.c
ui/gtk.c
ui/vnc.c
vl.c