Merge branch 'trivial-patches' of git://github.com/stefanha/qemu

* 'trivial-patches' of git://github.com/stefanha/qemu:
  pc: Drop redundant test for ROM memory region
  exec: make some functions static
  target-ppc: make some functions static
  ppc: add missing static
  vnc: add missing static
  vl.c: add missing static
  target-sparc: make do_unaligned_access static
  m68k: Return semihosting errno values correctly
  cadence_uart: More debug information

Conflicts:
	target-m68k/m68k-semi.c

diff --cc console.h
Simple merge

diff --cc exec-all.h
Simple merge

diff --cc exec.c
Simple merge

diff --cc hw/ppc.c
Simple merge

diff --cc target-ppc/cpu.h
Simple merge

diff --cc target-sparc/cpu.h
Simple merge

diff --cc ui/vnc-jobs.c
Simple merge

diff --cc ui/vnc.c
Simple merge

diff --cc ui/vnc.h
Simple merge

diff --cc vl.c
Simple merge