Merge commit '5e8861a0361d8d39ab69fe557294471c28c49c8b' into upstream-merge

Merge commit '5e8861a0361d8d39ab69fe557294471c28c49c8b' into upstream-merge

* commit '5e8861a0361d8d39ab69fe557294471c28c49c8b': (81 commits)
  build: move obj-TARGET-y variables to nested Makefile.objs
  build: move *-user/ objects to nested Makefile.objs
  build: add rules for nesting
  build: do not sprinkle around GENERATED_HEADERS dependencies
  build: remove trace-nested-y
  Revert "Revert "rtl8139: do the network/host communication only in normal operating mode""
  Kill off cpu_state_reset()
  linux-user: Use cpu_reset() after cpu_init() / cpu_copy()
  bsd-user: Use cpu_reset() in after cpu_init()
  leon3: Store SPARCCPU in ResetData
  leon3: Use cpu_sparc_init() to obtain SPARCCPU
  sun4u: Store SPARCCPU in ResetData
  sun4u: Let cpu_devinit() return SPARCCPU
  sun4u: Use cpu_sparc_init() to obtain SPARCCPU
  sun4m: Pass SPARCCPU to {main,secondary}_cpu_reset()
  sun4m: Use cpu_sparc_init() to obtain SPARCCPU
  target-sparc: Let cpu_sparc_init() return SPARCCPU
  cpu-exec: Use cpu_reset() in cpu_exec() for TARGET_PPC
  virtex_ml507: Pass PowerPCCPU to main_cpu_reset()
  virtex_ml507: Let ppc440_init_xilinx() return PowerPCCPU
  ...

Conflicts:
	Makefile.target

Signed-off-by: Marcelo Tosatti <mtosatti@redhat.com>