| commit | 087edb503afebf184f07078900efc26c73035e98 | |
| author | Peter Maydell <peter.maydell@linaro.org> | |
| Mon, 17 Mar 2014 13:05:48 +0000 (17 13:05 +0000) | ||
| committer | Peter Maydell <peter.maydell@linaro.org> | |
| Mon, 17 Mar 2014 13:05:48 +0000 (17 13:05 +0000) | ||
| tree | feb53effeb837f810e330a15e0b727a75e1d8f87 | treesnapshot (tar.gz zip) |
| parent | f4b11eee2f562c23b3efc33b96ba4542c9ca81aa | commitdiff |
| parent | 025172d56e11ba3d86d0937933a23aab3b8606b1 | commitdiff |
Merge remote-tracking branch 'remotes/bonzini/fixes-for-2.0' into staging
* remotes/bonzini/fixes-for-2.0:
vl.c: Output error on invalid machine type
target-alpha: fix subl and s8subl indentation
qemu-nbd: Fix coverity issues
rules.mak: Fix per object libs extraction
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
* remotes/bonzini/fixes-for-2.0:
vl.c: Output error on invalid machine type
target-alpha: fix subl and s8subl indentation
qemu-nbd: Fix coverity issues
rules.mak: Fix per object libs extraction
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>