tree 05f8b834115ee014363bae7099cd558a1d55f0b1
parent 9de36b1a7cf61aa8be365f13c81668b3e19fbc7f
parent 3a0c6c4ad6f97931f1d9a729322cb1612218ed96
author Anthony Liguori <aliguori@us.ibm.com> 1329482927 -0600
committer Anthony Liguori <aliguori@us.ibm.com> 1329482927 -0600

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