Merge remote-tracking branch 'qemu/master'
commitc57a4f88d226321d74d4f8004471a168ab359f16
authorStefan Weil <sw@weilnetz.de>
Fri, 5 Sep 2014 20:21:14 +0000 (5 22:21 +0200)
committerStefan Weil <sw@weilnetz.de>
Fri, 5 Sep 2014 20:21:14 +0000 (5 22:21 +0200)
tree36acfb0dd94be3e483854e40711569d0fbfa595d
parent248b40889f891b2e63376d84943a35bd9e8ef98f
parentf102f224556f292f55b6e25147741bb8c48c9451
Merge remote-tracking branch 'qemu/master'
exec.c
hw/display/vga.c
memory.c
qemu-char.c
qom/object.c
target-i386/cpu.c
vl.c