From: Anthony Liguori <aliguori@us.ibm.com>
Date: Fri, 22 Mar 2013 18:05:57 +0000 (-0500)
Subject: Merge remote-tracking branch 'stefanha/trivial-patches' into staging
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=cecd77ae6df060bbe8f0eea6691112097e680a52;p=qemu.git

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

# By liguang (2) and others
# Via Stefan Hajnoczi
* stefanha/trivial-patches:
  qdev: remove redundant abort()
  gitignore: ignore more files
  Use proper term in TCG README
  serial: Fix debug format strings
  Fix typos and misspellings
  Advertise --libdir in configure --help output
  memory: fix a bug of detection of memory region collision
  MinGW: Replace setsockopt by qemu_setsocketopt
---

cecd77ae6df060bbe8f0eea6691112097e680a52