diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2017-07-18 20:29:36 +0100 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2017-07-18 20:29:36 +0100 |
| commit | f9dada2baabb639feb988b3a564df7a06d214e18 (patch) | |
| tree | 0ff304a5dbd747bd6ec1a8a74d3e81a0ec093761 /crypto | |
| parent | 20df6c7689eb89ab48fa5d5766d5c724c818148e (diff) | |
| parent | 8508eee740c78d1465e25dad7c3e06137485dfbc (diff) | |
Merge remote-tracking branch 'remotes/cody/tags/block-pull-request' into staging
# gpg: Signature made Tue 18 Jul 2017 05:15:03 BST
# gpg: using RSA key 0xBDBE7B27C0DE3057
# gpg: Good signature from "Jeffrey Cody <jcody@redhat.com>"
# gpg: aka "Jeffrey Cody <jeff@codyprime.org>"
# gpg: aka "Jeffrey Cody <codyprime@gmail.com>"
# Primary key fingerprint: 9957 4B4D 3474 90E7 9D98 D624 BDBE 7B27 C0DE 3057
* remotes/cody/tags/block-pull-request:
live-block-ops.txt: Rename, rewrite, and improve it
bitmaps.md: Convert to rST; move it into 'interop' dir
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'crypto')
0 files changed, 0 insertions, 0 deletions