diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2014-04-11 14:07:24 +0100 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2014-04-11 14:07:24 +0100 |
| commit | 21e2db72601c48fa593ef7187faf17f324d925c5 (patch) | |
| tree | 52d94307a10820406589ddae56e795714d1f5f3b /linux-user/cris | |
| parent | 80fc7b1755492a3698f78f7c4973751f6cf02e14 (diff) | |
| parent | 5450466394c95cea8b661fb197ed215a4ab5d700 (diff) | |
Merge remote-tracking branch 'remotes/kevin/tags/for-upstream' into staging
Block patches for 2.0.0-rc3
# gpg: Signature made Fri 11 Apr 2014 13:37:34 BST using RSA key ID C88F2FD6
# gpg: Good signature from "Kevin Wolf <kwolf@redhat.com>"
* remotes/kevin/tags/for-upstream:
block-commit: speed is an optional parameter
iscsi: Remember to set ret for iscsi_open in error case
bochs: Fix catalog size check
bochs: Fix memory leak in bochs_open() error path
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'linux-user/cris')
0 files changed, 0 insertions, 0 deletions