From: Aurelien Jarno <aurelien@aurel32.net>
Date: Fri, 19 Oct 2012 18:18:44 +0000 (+0200)
Subject: Merge branch 'trivial-patches' of git://github.com/stefanha/qemu
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=3e50da65255bf4026b15e71299f4a5a40382a057;p=qemu.git

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

* 'trivial-patches' of git://github.com/stefanha/qemu:
  ui/vnc-jobs.c: Fix minor typos in comments
  net/tap-win32: Fix compiler warning caused by missing include statement
  configure: Remove unused parameters from main function
  target-arm/neon_helper: Remove obsolete FIXME comment
  targphys.h: Don't define target_phys_addr_t for user-mode emulators
  ui/vnc: Only report/use TIGHT_PNG encoding if enabled.
---

3e50da65255bf4026b15e71299f4a5a40382a057