From: Aurelien Jarno <aurelien@aurel32.net>
Date: Mon, 29 Jul 2013 07:03:23 +0000 (+0200)
Subject: Merge branch 'trivial-patches' of git://git.corpit.ru/qemu
X-Git-Tag: qemu-xen-4.4.0-rc1~6^2~127^2~2
X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=461bdb3414c40d6806194bf68c91521496b1042d;p=qemu-upstream-4.6-testing.git

Merge branch 'trivial-patches' of git://git.corpit.ru/qemu

* 'trivial-patches' of git://git.corpit.ru/qemu:
  target-mips: Remove assignment to a variable which is never used
  misc: Use g_assert_not_reached for code which is expected to be unreachable
  qemu-options: mention C-a h in the -nographic doc
  misc: Fix new typos in comments and strings
  linux-user: correct argument number for sys_mremap and sys_splice
  PPC: dbdma: macio: Fix format specifiers (build regression)
  watchdog: Remove break after exit
  exec: Remove env from list of poisoned names
  hw/9pfs: Fix potential memory leak and avoid reuse of freed memory
  timer: make timers_state static
  aes: Remove unused code (NDEBUG, u16)
---

461bdb3414c40d6806194bf68c91521496b1042d