diff options
| author | Peter Maydell | 2017-04-21 15:02:10 +0200 |
|---|---|---|
| committer | Peter Maydell | 2017-04-21 15:02:10 +0200 |
| commit | 09fc586db3b0917c3f5ad0c56e60920c5061422b (patch) | |
| tree | 463466161a66dba4d017fe0a6eb4f36fcc2738ad /hw/net/ftgmac100.c | |
| parent | Merge remote-tracking branch 'remotes/cohuck/tags/s390x-20170421' into staging (diff) | |
| parent | MAINTAINERS: update my email address (diff) | |
| download | qemu-09fc586db3b0917c3f5ad0c56e60920c5061422b.tar.gz qemu-09fc586db3b0917c3f5ad0c56e60920c5061422b.tar.xz qemu-09fc586db3b0917c3f5ad0c56e60920c5061422b.zip | |
Merge remote-tracking branch 'remotes/stefanha/tags/block-pull-request' into staging
# gpg: Signature made Fri 21 Apr 2017 10:43:04 BST
# 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:
MAINTAINERS: update my email address
MAINTAINERS: update Wen's email address
migration/block: use blk_pwrite_zeroes for each zero cluster
throttle: make throttle_config(throttle_get_config()) symmetric
throttle: do not use invalid config in test
qemu-options: explain disk I/O throttling options
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'hw/net/ftgmac100.c')
0 files changed, 0 insertions, 0 deletions