| commit | 142b9ca51d7260d20f6e87bd7f2020ac0a7d95d9 | |
| author | Peter Maydell <peter.maydell@linaro.org> | |
| Tue, 28 Mar 2017 10:10:36 +0000 (28 11:10 +0100) | ||
| committer | Peter Maydell <peter.maydell@linaro.org> | |
| Tue, 28 Mar 2017 10:10:36 +0000 (28 11:10 +0100) | ||
| tree | d3d32d9abbc93a6c4a4c65dc84569a567efddeaa | treesnapshot (tar.gz zip) |
| parent | 8c9ee217f0ee2a99d8aafa8a1db7f76176c18c99 | commitdiff |
| parent | dc62da88b5d17477227a3563a6ad466129d416d6 | commitdiff |
Merge remote-tracking branch 'remotes/stefanha/tags/block-pull-request' into staging
# gpg: Signature made Tue 28 Mar 2017 11:07:02 BST
# gpg: using RSA key 0x9CA4ABB381AB73C8
# gpg: Good signature from "Stefan Hajnoczi <stefanha@redhat.com>"
# gpg: aka "Stefan Hajnoczi <stefanha@gmail.com>"
# Primary key fingerprint: 8695 A8BF D3F9 7CDA AC35 775A 9CA4 ABB3 81AB 73C8
* remotes/stefanha/tags/block-pull-request:
parallels: wrong call to bdrv_truncate
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
# gpg: Signature made Tue 28 Mar 2017 11:07:02 BST
# gpg: using RSA key 0x9CA4ABB381AB73C8
# gpg: Good signature from "Stefan Hajnoczi <stefanha@redhat.com>"
# gpg: aka "Stefan Hajnoczi <stefanha@gmail.com>"
# Primary key fingerprint: 8695 A8BF D3F9 7CDA AC35 775A 9CA4 ABB3 81AB 73C8
* remotes/stefanha/tags/block-pull-request:
parallels: wrong call to bdrv_truncate
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>