From: Peter Maydell Date: Mon, 17 Mar 2014 13:05:48 +0000 (+0000) Subject: Merge remote-tracking branch 'remotes/bonzini/fixes-for-2.0' into staging X-Git-Tag: v2.0.0-rc1~47 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=087edb503afebf184f07078900efc26c73035e98;p=thirdparty%2Fqemu.git 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 --- 087edb503afebf184f07078900efc26c73035e98