Merge remote-tracking branch 'qemu/master'
commitab6c8fc0c0e25dc704da82972356bb329fae542b
authorStefan Weil <sw@weilnetz.de>
Tue, 8 Apr 2014 04:43:10 +0000 (8 06:43 +0200)
committerStefan Weil <sw@weilnetz.de>
Tue, 8 Apr 2014 04:43:10 +0000 (8 06:43 +0200)
treebfc6b2a5efe9c97f9864867731f48ea4dc0ca343
parente5b7d8a6f35430d82645f823f23aef985f845f77
parent55519a4b244e4822774b593e36647ecf7598286b
Merge remote-tracking branch 'qemu/master'
MAINTAINERS
Makefile
hw/char/serial.c
tests/Makefile
ui/gtk.c