Merge commit '
be1029ec30d2eee9e0eb56190d1ed2ed9a400bdf' into upstream-merge
* commit '
be1029ec30d2eee9e0eb56190d1ed2ed9a400bdf':
build: convert libhw to nested Makefile.objs
build: move target-independent hw/ objects to nested Makefile.objs
build: move qga/ objects to nested Makefile.objs
build: move qapi/ objects to nested Makefile.objs
build: move slirp/ objects to nested Makefile.objs
build: move audio/ objects to nested Makefile.objs
build: move ui/ objects to nested Makefile.objs
build: move fsdev/ objects to nested Makefile.objs
build: move net/ objects to nested Makefile.objs
build: move block/ objects to nested Makefile.objs
build: adapt qom/Makefile and move it to Makefile.objs
build: move rules for nesting to Makefile.objs
build: move other target-*/ objects to nested Makefile.objs
dump: remove dumping stuff from cpu-all.h
dump: change cpu_get_note_size to return ssize_t
dump: do not compile dump.o for user-mode emulation
build: move libobj-y variable to nested Makefile.objs
Conflicts:
Makefile.objs
Signed-off-by: Marcelo Tosatti <mtosatti@redhat.com>