projects
/
sdk
/
emulator
/
qemu.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
f2bcdc8
e4d9df4
)
Merge remote-tracking branch 'remotes/qmp-unstable/queue/qmp' into staging
author
Peter Maydell
<peter.maydell@linaro.org>
Mon, 15 Sep 2014 18:44:34 +0000
(19:44 +0100)
committer
Peter Maydell
<peter.maydell@linaro.org>
Mon, 15 Sep 2014 18:44:34 +0000
(19:44 +0100)
* 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>
1
2
exec.c
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
exec.c
Simple merge