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

1  2 
configure

diff --cc configure
Simple merge