]> git.ipfire.org Git - thirdparty/qemu.git/commitdiff
Merge remote-tracking branch 'stefanha/trivial-patches' into staging
authorAnthony Liguori <aliguori@us.ibm.com>
Fri, 24 Feb 2012 15:51:24 +0000 (09:51 -0600)
committerAnthony Liguori <aliguori@us.ibm.com>
Fri, 24 Feb 2012 15:51:24 +0000 (09:51 -0600)
* 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

1  2 
vl.c

diff --cc vl.c
Simple merge