Merge remote-tracking branch 'remotes/jasowang/tags/net-pull-request' into staging

[sdk/emulator/qemu.git] / MAINTAINERS

diff --git a/MAINTAINERS b/MAINTAINERS
index 83e0f13..d1439a8 100644 (file)
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -971,7 +971,6 @@ 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/