Merge branches 'tracing/ftrace' and 'linus' into tracing/core

[mv-sheeva.git] / MAINTAINERS

diff --git a/MAINTAINERS b/MAINTAINERS
index a17f0b161e032d570f7747b9715e163d706e62e6..dd3c11c4c3d2a261b6696caf1f6cf924757a87af 100644 (file)
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -3882,6 +3882,15 @@ L:       linux-ide@vger.kernel.org
 T:     git kernel.org:/pub/scm/linux/kernel/git/jgarzik/libata-dev.git
 S:     Supported
 
+SERVER ENGINES 10Gbps NIC - BladeEngine 2 DRIVER
+P:     Sathya Perla
+M:     sathyap@serverengines.com
+P:      Subbu Seetharaman
+M:      subbus@serverengines.com
+L:      netdev@vger.kernel.org
+W:      http://www.serverengines.com
+S:      Supported
+
 SFC NETWORK DRIVER
 P:     Steve Hodgson
 P:     Ben Hutchings