Merge commit '5e59b024351f827f903f98ae522687ea53dc4f23' into upstream-merge

Merge commit '5e59b024351f827f903f98ae522687ea53dc4f23' into upstream-merge

* commit '5e59b024351f827f903f98ae522687ea53dc4f23': (41 commits)
  x86: Fixed incorrect segment base address addition in 64-bits mode
  place qemu-sockets.c contributions since 2012-01-13 under GPLv2+
  build: Fix linking failure for qemu-ga
  Avoid redefining inline
  Avoid returning void
  hw/escc: Drop duplicate definition of 'disabled' property
  build: get dependency file directories from object file names
  build: include qapi-generated/ files in qga/Makefile.objs
  tests: Makefile: include dependency files
  vl.c: Don't print errno after failed qemu_chr_new()
  target-xtensa: fix big-endian BBS/BBC implementation
  target-or32: Add testcases
  target-or32: Add linux user support
  target-or32: Add linux syscall, signal and termbits
  target-or32: Add gdb stub support
  target-or32: Add system instructions
  target-or32: Add a IIS dummy board
  target-or32: Add timer support
  target-or32: Add PIC support
  target-or32: Add instruction translation
  ...

Conflicts:
	hw/pci.c

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