Merge remote-tracking branch 'qemu/master'
commit5705e543f7361725382bc5170ddfb8dbb239e5d9
authorStefan Weil <sw@weilnetz.de>
Sun, 29 Jun 2014 14:32:09 +0000 (29 16:32 +0200)
committerStefan Weil <sw@weilnetz.de>
Sun, 29 Jun 2014 14:32:09 +0000 (29 16:32 +0200)
treef65ac6b39192b76f76b0655ced2d6995b84481d1
parenta7ae8ccacff0e67059b09081c7be2dcf647b44b4
parentac8076ac8638428e2a96d5f6c7e80f2014f9e379
Merge remote-tracking branch 'qemu/master'
Makefile
monitor.c
qemu-char.c