projects / qemu.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: f4b11ee 025172d)
Merge remote-tracking branch 'remotes/bonzini/fixes-for-2.0' into staging
authorPeter Maydell <peter.maydell@linaro.org>
Mon, 17 Mar 2014 13:05:48 +0000 (13:05 +0000)
committerPeter Maydell <peter.maydell@linaro.org>
Mon, 17 Mar 2014 13:05:48 +0000 (13:05 +0000)
* 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>

Trivial merge
Unnamed repository; edit this file 'description' to name the repository.