diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2019-10-29 18:46:52 +0000 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2019-10-29 18:46:52 +0000 |
| commit | 1cfe28cdcabd10e31b0e05db8a2cfd9993f315e2 (patch) | |
| tree | 2b97e45c782fec15c303c8f906c1d69acb7f34e0 /MAINTAINERS | |
| parent | 69f735179e064ba4e2c30653f681b616b4791aa7 (diff) | |
| parent | 1e907a32b77e5d418538453df5945242e43224fa (diff) | |
Merge remote-tracking branch 'remotes/jasowang/tags/net-pull-request' into staging
# gpg: Signature made Tue 29 Oct 2019 02:33:36 GMT
# gpg: using RSA key EF04965B398D6211
# gpg: Good signature from "Jason Wang (Jason Wang on RedHat) <jasowang@redhat.com>" [marginal]
# gpg: WARNING: This key is not certified with sufficiently trusted signatures!
# gpg: It is not certain that the signature belongs to the owner.
# Primary key fingerprint: 215D 46F4 8246 689E C77F 3562 EF04 965B 398D 6211
* remotes/jasowang/tags/net-pull-request:
COLO-compare: Fix incorrect `if` logic
virtio-net: prevent offloads reset on migration
virtio: new post_load hook
net: add tulip (dec21143) driver
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'MAINTAINERS')
| -rw-r--r-- | MAINTAINERS | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index 5b27888533..325e67a04e 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -1666,6 +1666,12 @@ M: Stefan Weil <sw@weilnetz.de> S: Maintained F: hw/net/eepro100.c +tulip +M: Sven Schnelle <svens@stackframe.org> +S: Maintained +F: hw/net/tulip.c +F: hw/net/tulip.h + Generic Loader M: Alistair Francis <alistair@alistair23.me> S: Maintained |