Merge remote-tracking branch 'stefanha/trivial-patches' into staging
commitc7b4c36714a442ae5abd26de293cb5e967be6e12
authorAnthony Liguori <aliguori@us.ibm.com>
Mon, 1 Apr 2013 15:36:09 +0000 (1 10:36 -0500)
committerAnthony Liguori <aliguori@us.ibm.com>
Mon, 1 Apr 2013 15:36:09 +0000 (1 10:36 -0500)
tree39401bb0739d1b682638776da713d7f196c5e26d
parente63d28d7dbfcec81214aecc9ff0aaee46e87aa44
parentb0d62a3d8e1ea9eccd246829a03e2d23f0982431
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
configure