| commit | eab0ebc7fe3662ebb4348ac763e7aabc7e355566 | |
| author | Peter Maydell <peter.maydell@linaro.org> | |
| Thu, 3 Dec 2015 10:43:43 +0000 (3 10:43 +0000) | ||
| committer | Peter Maydell <peter.maydell@linaro.org> | |
| Thu, 3 Dec 2015 10:43:43 +0000 (3 10:43 +0000) | ||
| tree | 16cb298fdd905974c30e26f989b3b8f5bfae8da3 | treesnapshot (tar.gz zip) |
| parent | ec1b9aa89d7970c7edc9594c33206690f5ba3c87 | commitdiff |
| parent | a694ee343d13159d214823294bbda08e4bdac685 | commitdiff |
Merge remote-tracking branch 'remotes/juanquintela/tags/migration/20151203' into staging
migration/next for 20151203
# gpg: Signature made Wed 02 Dec 2015 23:19:10 GMT using RSA key ID 5872D723
# gpg: Good signature from "Juan Quintela <quintela@redhat.com>"
# gpg: aka "Juan Quintela <quintela@trasno.org>"
* remotes/juanquintela/tags/migration/20151203:
migration: do floating-point division
migration: Clean up use of g_poll() in socket_writev_buffer()
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
migration/next for 20151203
# gpg: Signature made Wed 02 Dec 2015 23:19:10 GMT using RSA key ID 5872D723
# gpg: Good signature from "Juan Quintela <quintela@redhat.com>"
# gpg: aka "Juan Quintela <quintela@trasno.org>"
* remotes/juanquintela/tags/migration/20151203:
migration: do floating-point division
migration: Clean up use of g_poll() in socket_writev_buffer()
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>