| commit | ad3c6418c2e282633a2f0e91754980d1a4d5b078 | |
| author | Peter Maydell <peter.maydell@linaro.org> | |
| Thu, 23 Mar 2017 09:56:54 +0000 (23 09:56 +0000) | ||
| committer | Peter Maydell <peter.maydell@linaro.org> | |
| Thu, 23 Mar 2017 09:56:54 +0000 (23 09:56 +0000) | ||
| tree | cba18f02147b23b1887c1473d308785bfeabe155 | treesnapshot (tar.gz zip) |
| parent | 55a19ad8b2d0797e3a8fe90ab99a9bb713824059 | commitdiff |
| parent | ff5bbe56c6f9a74c2d77389a21d5d2368458c939 | commitdiff |
Merge remote-tracking branch 'remotes/stefanha/tags/block-pull-request' into staging
# gpg: Signature made Wed 22 Mar 2017 12:54:29 GMT
# 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: fix default options parsing
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
# gpg: Signature made Wed 22 Mar 2017 12:54:29 GMT
# 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: fix default options parsing
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>