tree 140c0410e1d8133ddd33e07ad2fc9c2a8d0e824b
parent 97fe81d3e8613be13754ff096c16b73010fd60ad
parent 95df51a4a02a853af8828c281bce2d4f2a41d6fd
author Anthony Liguori <aliguori@us.ibm.com> 1348607176 -0500
committer Anthony Liguori <aliguori@us.ibm.com> 1348607176 -0500

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