From: Blue Swirl <blauwirbel@gmail.com>
Date: Sat, 3 Nov 2012 12:55:05 +0000 (+0000)
Subject: Merge branch 'trivial-patches' of git://github.com/stefanha/qemu
X-Git-Tag: v1.3.0-rc0~70
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=ef84755ebb38b4f5629b24440bb00f1ef5287707;p=thirdparty%2Fqemu.git

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
---

ef84755ebb38b4f5629b24440bb00f1ef5287707