Merge remote-tracking branch 'remotes/juanquintela/tags/migration/20151203' into...
authorPeter Maydell <peter.maydell@linaro.org>
Thu, 3 Dec 2015 10:43:43 +0000 (10:43 +0000)
committerPeter Maydell <peter.maydell@linaro.org>
Thu, 3 Dec 2015 10:43:43 +0000 (10:43 +0000)
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>

Trivial merge