tree e963b562a7e7abdc19a932c7777dc8d68c3b865c
parent 394cfa39ba24dd838ace1308ae24961243947fb8
parent 8e86729a0e83b557c22808a2337252c969ca3986
author Anthony Liguori <aliguori@amazon.com> 1385046511 -0800
committer Anthony Liguori <aliguori@amazon.com> 1385046511 -0800

Merge remote-tracking branch 'quintela/migration.next' into staging

# By Wangting (Kathy)
# Via Juan Quintela
* quintela/migration.next:
  The calculation of bytes_xfer in qemu_put_buffer() is wrong

Message-id: 1384946787-8190-1-git-send-email-quintela@redhat.com
Signed-off-by: Anthony Liguori <aliguori@amazon.com>