]> git.proxmox.com Git - qemu.git/commit
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)
commit85f38553031b1a6e07f786c9ab0d403af7252b4f
tree4d9c0efac9343b2073732b368860f894e672a9b5
parent18ac5499584319ef828c7da4c6223f818dde0234
parentf293d8b1f26953ccaef794785cea0619d4f8c268
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
vl.c