From: Anthony Liguori <aliguori@us.ibm.com>
Date: Mon, 1 Apr 2013 15:36:09 +0000 (-0500)
Subject: Merge remote-tracking branch 'stefanha/trivial-patches' into staging
X-Git-Tag: v1.5.0-rc0~375
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=c7b4c36714a442ae5abd26de293cb5e967be6e12;p=thirdparty%2Fqemu.git

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

# By Dunrong Huang (1) and others
# Via Stefan Hajnoczi
* stefanha/trivial-patches:
  hw/tcx: Remove unused 'addr' field and the property that sets it
  hw/i386/pc: format load_linux function
  configure: show debug-info option in --help output
---

c7b4c36714a442ae5abd26de293cb5e967be6e12