From: Anthony Liguori <aliguori@us.ibm.com>
Date: Tue, 25 Sep 2012 21:06:16 +0000 (-0500)
Subject: Merge remote-tracking branch 'stefanha/trivial-patches' into staging
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=3988475b9b7fa251b00a29b076761d8c1c7e64dc;p=qemu.git

Merge remote-tracking branch 'stefanha/trivial-patches' into staging

* stefanha/trivial-patches:
  w32: Always use standard instead of native format strings
  net/socket: Fix compiler warning (regression for MinGW)
  linux-user: Remove redundant null check and replace free by g_free
  qemu-timer: simplify qemu_run_timers
  TextConsole: saturate escape parameter in TTY_STATE_CSI
  curses: don't initialize curses when qemu is daemonized
  dtrace backend: add function to reserved words
  pflash_cfi01: Fix warning caused by unreachable code
  ioh3420: Remove unreachable code
  lm4549: Fix buffer overflow
  cadence_uart: Fix buffer overflow
  qemu-sockets: Fix potential memory leak
  qemu-ga: Remove unreachable code after g_error
  target-i386: Allow tsc-frequency to be larger then 2.147G
---

3988475b9b7fa251b00a29b076761d8c1c7e64dc