Merge branch 'trivial-patches' of git://github.com/stefanha/qemu
authorBlue Swirl <blauwirbel@gmail.com>
Sat, 3 Nov 2012 12:55:05 +0000 (12:55 +0000)
committerBlue Swirl <blauwirbel@gmail.com>
Sat, 3 Nov 2012 12:55:05 +0000 (12:55 +0000)
commitef84755ebb38b4f5629b24440bb00f1ef5287707
treec2d74584b5f8c85c4c61ae650e628e08403b69ec
parentb76f0d8c2e3eac94bc7fd90a510cb7426b2a2699
parent0d3cf3b6ff469bba95ae235021a3be232af4068d
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
console.h
exec-all.h
exec.c
hw/ppc.c
target-ppc/cpu.h
target-sparc/cpu.h
ui/vnc-jobs.c
ui/vnc.c
ui/vnc.h
vl.c