Merge remote-tracking branch 'remotes/juanquintela/tags/migration/20150326' into...
commit99b7f47c54ae7932715a1f58ed9a128451fb2b85
authorPeter Maydell <peter.maydell@linaro.org>
Thu, 26 Mar 2015 14:47:53 +0000 (26 14:47 +0000)
committerPeter Maydell <peter.maydell@linaro.org>
Thu, 26 Mar 2015 14:47:53 +0000 (26 14:47 +0000)
tree28882e5f8c3c2d66a9ccfd4d434639c480f4f0c4
parent1ee76e5191e4275bf2f7ad251385c96d6ce47b86
parent43edc0ed11a4d25f2fe67bb9d89a8a6a0a43b1e0
Merge remote-tracking branch 'remotes/juanquintela/tags/migration/20150326' into staging

migration/next for 20150326

# gpg: Signature made Thu Mar 26 14:31:55 2015 GMT using RSA key ID 5872D723
# gpg: Can't check signature: public key not found

* remotes/juanquintela/tags/migration/20150326:
  migration:  remove last_sent_block from save_page_header
  rdma: Fix cleanup in error paths
  Avoid crashing on multiple -incoming

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>