Merge remote-tracking branch 'qemu/master'
commiteaff292b6f0eca4762537b59863cd942a886e16c
authorStefan Weil <sw@weilnetz.de>
Tue, 19 Aug 2014 06:24:20 +0000 (19 08:24 +0200)
committerStefan Weil <sw@weilnetz.de>
Tue, 19 Aug 2014 06:24:20 +0000 (19 08:24 +0200)
tree4d094c35a7a35b29823c97f952d2d3dc7ff03bfe
parentbd11d28878ca863952d0bec467b8a482015efbe2
parent08ab59770da57648bfb8fc9be37f0ef7fb50b0f9
Merge remote-tracking branch 'qemu/master'
memory.c
qemu-char.c
qemu-options.hx
vl.c