| commit | ea2afcf5b6727a577cf561fd8fe0d8c397ecc927 | |
| author | Peter Maydell <peter.maydell@linaro.org> | |
| Fri, 24 Mar 2017 14:14:18 +0000 (24 14:14 +0000) | ||
| committer | Peter Maydell <peter.maydell@linaro.org> | |
| Fri, 24 Mar 2017 14:14:18 +0000 (24 14:14 +0000) | ||
| tree | 6036f725cedaf78c0720043df3705164ff4cbbf9 | treesnapshot (tar.gz zip) |
| parent | 7150d34a1d60851d73d6ab6783b12b1d25e68f86 | commitdiff |
| parent | 0d3ef78829332f2fdc323d1b625b60fe9c89119c | commitdiff |
Merge remote-tracking branch 'remotes/stefanha/tags/tracing-pull-request' into staging
# gpg: Signature made Fri 24 Mar 2017 14:08:41 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/tracing-pull-request:
trace: Avoid abuse of amdvi_mmio_read
trace: Fix incorrect megasas trace parameters
trace: Fix backwards mirror_yield parameters
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
# gpg: Signature made Fri 24 Mar 2017 14:08:41 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/tracing-pull-request:
trace: Avoid abuse of amdvi_mmio_read
trace: Fix incorrect megasas trace parameters
trace: Fix backwards mirror_yield parameters
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>