diff options
author | David S. Miller <davem@davemloft.net> | 2011-02-04 17:28:58 -0500 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2011-02-04 17:28:58 -0500 |
commit | bd4a6974cc9090ef3851e5b0a2071e5383565c7c (patch) | |
tree | e96ef46426d293b730a305b5185ba5412c9172d4 /MAINTAINERS | |
parent | 2b7bcebf958c74124220ee8103024def8597b36c (diff) | |
parent | 1e6d93e45b231b3ae87c01902ede2315aacfe976 (diff) |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Diffstat (limited to 'MAINTAINERS')
-rw-r--r-- | MAINTAINERS | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index 424887b4a414..420b9df3b470 100644 --- a/MAINTAINERS +++ b/MAINTAINERS | |||
@@ -5544,12 +5544,11 @@ S: Supported | |||
5544 | F: drivers/scsi/be2iscsi/ | 5544 | F: drivers/scsi/be2iscsi/ |
5545 | 5545 | ||
5546 | SERVER ENGINES 10Gbps NIC - BladeEngine 2 DRIVER | 5546 | SERVER ENGINES 10Gbps NIC - BladeEngine 2 DRIVER |
5547 | M: Sathya Perla <sathyap@serverengines.com> | 5547 | M: Sathya Perla <sathya.perla@emulex.com> |
5548 | M: Subbu Seetharaman <subbus@serverengines.com> | 5548 | M: Subbu Seetharaman <subbu.seetharaman@emulex.com> |
5549 | M: Sarveshwar Bandi <sarveshwarb@serverengines.com> | 5549 | M: Ajit Khaparde <ajit.khaparde@emulex.com> |
5550 | M: Ajit Khaparde <ajitk@serverengines.com> | ||
5551 | L: netdev@vger.kernel.org | 5550 | L: netdev@vger.kernel.org |
5552 | W: http://www.serverengines.com | 5551 | W: http://www.emulex.com |
5553 | S: Supported | 5552 | S: Supported |
5554 | F: drivers/net/benet/ | 5553 | F: drivers/net/benet/ |
5555 | 5554 | ||