aboutsummaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorPeter Maydell <peter.maydell@linaro.org>2017-11-16 17:26:43 +0000
committerPeter Maydell <peter.maydell@linaro.org>2017-11-16 17:26:43 +0000
commitafdad8b6840d3ea4bc8b7cd0f1b9f25801748c50 (patch)
treeb8d067eaca77ab95d54e4c433babad2306d64129 /include
parent62955e101e4bdc113e3205174567c9c8e12ec1b4 (diff)
parent341e0b5658681f46680024cdbfc998717d85cc35 (diff)
downloadqemu-afdad8b6840d3ea4bc8b7cd0f1b9f25801748c50.zip
qemu-afdad8b6840d3ea4bc8b7cd0f1b9f25801748c50.tar.gz
qemu-afdad8b6840d3ea4bc8b7cd0f1b9f25801748c50.tar.bz2
Merge remote-tracking branch 'remotes/stefanha/tags/block-pull-request' into staging
# gpg: Signature made Thu 16 Nov 2017 16:36:02 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: throttle-groups: forget timer and schedule next TGM on detach Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'include')
0 files changed, 0 insertions, 0 deletions