tree c2d74584b5f8c85c4c61ae650e628e08403b69ec
parent b76f0d8c2e3eac94bc7fd90a510cb7426b2a2699
parent 0d3cf3b6ff469bba95ae235021a3be232af4068d
author Blue Swirl <blauwirbel@gmail.com> 1351947305 +0000
committer Blue Swirl <blauwirbel@gmail.com> 1351947305 +0000

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