diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2015-05-12 10:40:31 +0100 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2015-05-12 10:40:31 +0100 |
| commit | 19fbe5084c1da6af95177c86e4cab64241d479a8 (patch) | |
| tree | 876b9c0cb523ca69238a48f9e36b09506c9853b8 /MAINTAINERS | |
| parent | 704eb1c09963149db4a3407d5ba173ba2a9244bb (diff) | |
| parent | 7db161f6dd144760b2912026d992837ef80ca7e7 (diff) | |
| download | qemu-19fbe5084c1da6af95177c86e4cab64241d479a8.tar.gz qemu-19fbe5084c1da6af95177c86e4cab64241d479a8.tar.bz2 qemu-19fbe5084c1da6af95177c86e4cab64241d479a8.zip | |
Merge remote-tracking branch 'remotes/stefanha/tags/net-pull-request' into staging
# gpg: Signature made Mon May 11 16:25:58 2015 BST using RSA key ID 81AB73C8
# gpg: Good signature from "Stefan Hajnoczi <stefanha@redhat.com>"
# gpg: aka "Stefan Hajnoczi <stefanha@gmail.com>"
* remotes/stefanha/tags/net-pull-request:
rocker: timestamp on the debug logs helps correlate with events in the VM
MAINTAINERS: add rocker
rocker: add tests
rocker: add new rocker switch device
pci: add network device class 'other' for network switches
pci: add rocker device ID
rocker: add register programming guide
virtio-net: use qemu_mac_strdup_printf
net: add MAC address string printer
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 d858c49566..b3552b2c19 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -760,6 +760,12 @@ S: Maintained F: hw/net/vmxnet* F: hw/scsi/vmw_pvscsi* +Rocker +M: Scott Feldman <sfeldma@gmail.com> +M: Jiri Pirko <jiri@resnulli.us> +S: Maintained +F: hw/net/rocker/ + Subsystems ---------- Audio |