]> git.proxmox.com Git - mirror_qemu.git/commit
projects / mirror_qemu.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: f2bcdc8 e4d9df4)
Merge remote-tracking branch 'remotes/qmp-unstable/queue/qmp' into staging
authorPeter Maydell <peter.maydell@linaro.org>
Mon, 15 Sep 2014 18:44:34 +0000 (19:44 +0100)
committerPeter Maydell <peter.maydell@linaro.org>
Mon, 15 Sep 2014 18:44:34 +0000 (19:44 +0100)
commitcc35a44cf7b522b1fd0b786562b7de4b881c41b0
treeab9751a4ceac9c6ad57e748a8ab5407c5cbf75aatree
parentf2bcdc8de018d33ecf93da7a94f327956ecf76eacommit | diff
parente4d9df4fb16861f413374b69fcdb12c8c7a4a17ecommit | diff
Merge remote-tracking branch 'remotes/qmp-unstable/queue/qmp' into staging

* remotes/qmp-unstable/queue/qmp:
  exec: file_ram_alloc(): print error when prealloc fails
  monitor: fix debug print compiling error

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
exec.c diff1 | diff2 | blob | history
QEMU mirror