Merge commit '1215c6e7615897e4a0bfd6867b762a47fc34f37f' into upstream-merge

Merge commit '1215c6e7615897e4a0bfd6867b762a47fc34f37f' into upstream-merge

* commit '1215c6e7615897e4a0bfd6867b762a47fc34f37f':
  Move generation of config-host.h to Makefile from configure
  Don't include config-host.mak from inside config.mak
  CRIS: Update PR_EDA on TLB faults.
  Clean up test for qdev_init() failure
  Warn if value of qdev_init() isn't checked
  Make isa_create() terminate program on failure
  New qdev_init_nofail()
  Check return value of qdev_init()
  Make qdev_init() destroy the device on failure
  Unbreak USB autoconnect filters
  tcg: improve output log
  target-i386: fix ARPL
  configure and Makefile are not generated in qemu
  Don't use implicit rules for Makefile
  optionrom: create .PHONY variable
  add build-all to .PHONY rules
  optionrom: remove use of implicit RM variable
  AIOLIBS is not used anywhere
  qdev: move comment

Conflicts:
	Makefile

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