]> git.ipfire.org Git - thirdparty/qemu.git/commit
Merge remote-tracking branch 'remotes/mdroth/qga-pull-2014-02-24' into staging
authorPeter Maydell <peter.maydell@linaro.org>
Tue, 25 Feb 2014 12:30:01 +0000 (12:30 +0000)
committerPeter Maydell <peter.maydell@linaro.org>
Tue, 25 Feb 2014 12:30:01 +0000 (12:30 +0000)
commit0459650d94d18218808fcabc8c3227d2ee99af39
tree89b1f02e7e4784c444faf91506ca7fcfd8bb7e7b
parent05fd3bf2a1c9fc26414d3cf608732c40d0d9eb23
parenta749f42da5129bbfadea6926964d9a213ed4bc5f
Merge remote-tracking branch 'remotes/mdroth/qga-pull-2014-02-24' into staging

* remotes/mdroth/qga-pull-2014-02-24:
  qemu-ga: isa-serial support on Windows
  qga: Fix memory allocation pasto
  qga: Don't require 'time' argument in guest-set-time command
  qga: vss-win32: Fix interference with snapshot deletion by other VSS request
  qga: vss-win32: Fix interference with snapshot creation by other VSS requesters
  qga: vss-win32: Use NULL as an invalid pointer for OpenEvent and CreateEvent

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>