diff options
author | Ingo Molnar <mingo@elte.hu> | 2009-03-18 06:58:45 +0100 |
---|---|---|
committer | Ingo Molnar <mingo@elte.hu> | 2009-03-18 06:58:45 +0100 |
commit | 03418c7efaa429dc7647ac93e3862e3fe1816873 (patch) | |
tree | d5a101034139f846b700dfdf53eb6737ea6c4365 /MAINTAINERS | |
parent | 4176935b58eeb636917e65a2c388e4607e36cce6 (diff) | |
parent | ee568b25ee9e160b32d1aef73d8b2ee9c05d34db (diff) | |
download | linux-03418c7efaa429dc7647ac93e3862e3fe1816873.tar.gz linux-03418c7efaa429dc7647ac93e3862e3fe1816873.tar.bz2 linux-03418c7efaa429dc7647ac93e3862e3fe1816873.zip |
Merge branches 'tracing/ftrace' and 'linus' into tracing/core
Diffstat (limited to 'MAINTAINERS')
-rw-r--r-- | MAINTAINERS | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index a17f0b161e03..dd3c11c4c3d2 100644 --- 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 |