Merge remote-tracking branch 'qemu/master'
commitfe043d06a357d81ceea27e203e5deee016a3d295
authorStefan Weil <sw@weilnetz.de>
Wed, 11 May 2016 12:50:32 +0000 (11 14:50 +0200)
committerStefan Weil <sw@weilnetz.de>
Wed, 11 May 2016 12:50:32 +0000 (11 14:50 +0200)
treeacb614d91126ea8d8e8d3193b68280e271cefea6
parent10ffb23ce32735239eb47b4554f2e49ff790e88a
parent860a3b34854d8abe9af9f1eb584691de926ce897
Merge remote-tracking branch 'qemu/master'
hw/display/vga.c