tree 8351478144c07306f24923791b1e4cd988770513
parent b6a9f4682e62c686995cc1a1fe2ef4a57a92020b
parent 6c86f405efd6532b58ad1b607cc9f11e856ef5ca
author Aurelien Jarno <aurelien@aurel32.net> 1375081403 +0200
committer Aurelien Jarno <aurelien@aurel32.net> 1375081403 +0200

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)