From: Anthony Liguori <aliguori@us.ibm.com>
Date: Mon, 23 Apr 2012 14:58:33 +0000 (-0500)
Subject: Merge remote-tracking branch 'stefanha/trivial-patches' into staging
X-Git-Tag: v1.1-rc0~84
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=6b03296606c665beb570eaa53a71f7688a43b9e7;p=thirdparty%2Fqemu.git

Merge remote-tracking branch 'stefanha/trivial-patches' into staging

* stefanha/trivial-patches:
  Add .gitignore for tests/
  e1000: Fix spelling (segmentaion -> segmentation) in debug output
  spice-qemu-char.c: Show what name is unsupported
  pflash_cfi01: remove redundant line
  qxl: Add missing GCC_FMT_ATTR and fix format specifier
  fix block_job_set_speed name in documentation
  error.c: don't return value for void function
---

6b03296606c665beb570eaa53a71f7688a43b9e7