Merge commit 'c353f261946ddbd814b333ae2440712b486977fd' into upstream-merge
commit185c41dcb2cf357c0977dbedd2ef5b4c20f93a13
authorMarcelo Tosatti <mtosatti@redhat.com>
Tue, 12 Jun 2012 22:11:10 +0000 (12 19:11 -0300)
committerMarcelo Tosatti <mtosatti@redhat.com>
Tue, 12 Jun 2012 22:11:10 +0000 (12 19:11 -0300)
treed63e8be8d711ddfafcd5e169a4dfdb8f5ab50986
parentb92fe9a068e7661e2a6f340a00458c4a2b1e277b
parentc353f261946ddbd814b333ae2440712b486977fd
Merge commit 'c353f261946ddbd814b333ae2440712b486977fd' into upstream-merge

* commit 'c353f261946ddbd814b333ae2440712b486977fd':
  build: move per-target hw/ objects to nested Makefile.objs

Conflicts:
Makefile.target

Signed-off-by: Marcelo Tosatti <mtosatti@redhat.com>
configure
hw/Makefile.objs