From: Anthony Liguori <aliguori@us.ibm.com>
Date: Fri, 24 Feb 2012 15:51:24 +0000 (-0600)
Subject: Merge remote-tracking branch 'stefanha/trivial-patches' into staging
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=85f38553031b1a6e07f786c9ab0d403af7252b4f;p=qemu.git

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

* stefanha/trivial-patches:
  slirp/misc: fix gcc __warn_memset_zero_len warnings
  vl.c: Increase width of machine name column in "-M ?" output
  tcg: Remove unneeded include statements
---

85f38553031b1a6e07f786c9ab0d403af7252b4f