Merge remote-tracking branch 'qemu/master'
commitce528ab045e2d9075a3068d8056983eee45e4c22
authorStefan Weil <sw@weilnetz.de>
Thu, 31 Mar 2016 05:44:55 +0000 (31 07:44 +0200)
committerStefan Weil <sw@weilnetz.de>
Thu, 31 Mar 2016 05:44:55 +0000 (31 07:44 +0200)
treef6804d554aa85eacf0c4b4ae6d4567c73134f520
parentb7fd85afd4040e57e5b9df3c56a2f044affb44b4
parent9370a3bbc478f623dd21d783560629ea2064625b
Merge remote-tracking branch 'qemu/master'
default-configs/arm-softmmu.mak
monitor.c