From: Anthony Liguori <aliguori@us.ibm.com>
Date: Fri, 17 Feb 2012 12:48:47 +0000 (-0600)
Subject: Merge remote-tracking branch 'stefanha/trivial-patches' into staging
X-Git-Tag: v1.1-rc0~396
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=a19255a369f0ef34dfbbc1ed2631e68fbbebb8ce;p=thirdparty%2Fqemu.git

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

* stefanha/trivial-patches:
  linux-user: brk() debugging
  virtio: Remove unneeded g_free() check in virtio_cleanup()
  net: remove extra spaces in help messages
  fmopl: Fix typo in function name
  vl.c: Fix typo in variable name
  ide: fix compilation errors when DEBUG_IDE is set
  cpu-exec.c: Correct comment about this file and indentation cleanup
  CODING_STYLE: Clarify style for enum and function type names
  linux-user: fail execve() if env/args too big
---

a19255a369f0ef34dfbbc1ed2631e68fbbebb8ce