OSDN Git Service

Merge remote-tracking branch 'remotes/cody/tags/block-pull-request' into staging
authorPeter Maydell <peter.maydell@linaro.org>
Tue, 18 Jul 2017 19:29:36 +0000 (20:29 +0100)
committerPeter Maydell <peter.maydell@linaro.org>
Tue, 18 Jul 2017 19:29:36 +0000 (20:29 +0100)
commitf9dada2baabb639feb988b3a564df7a06d214e18
tree0ff304a5dbd747bd6ec1a8a74d3e81a0ec093761
parent20df6c7689eb89ab48fa5d5766d5c724c818148e
parent8508eee740c78d1465e25dad7c3e06137485dfbc
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>