diff options
author | Felix Blyakher <felixb@sgi.com> | 2009-03-24 15:25:34 -0400 |
---|---|---|
committer | Felix Blyakher <felixb@sgi.com> | 2009-03-24 15:25:34 -0400 |
commit | 61454f33389ecfac68846e07d29c8d18af342c43 (patch) | |
tree | 7dcf069151aa7331c9261d262df4c192b2fabc34 /MAINTAINERS | |
parent | 4740cd8b4f27d6ac11e76c432d5d03fb780b2596 (diff) | |
parent | 8e0ee43bc2c3e19db56a4adaa9a9b04ce885cd84 (diff) |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'MAINTAINERS')
-rw-r--r-- | MAINTAINERS | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index 8c6809205618..7758ab7fd062 100644 --- a/MAINTAINERS +++ b/MAINTAINERS | |||
@@ -3876,6 +3876,15 @@ L: linux-ide@vger.kernel.org | |||
3876 | T: git kernel.org:/pub/scm/linux/kernel/git/jgarzik/libata-dev.git | 3876 | T: git kernel.org:/pub/scm/linux/kernel/git/jgarzik/libata-dev.git |
3877 | S: Supported | 3877 | S: Supported |
3878 | 3878 | ||
3879 | SERVER ENGINES 10Gbps NIC - BladeEngine 2 DRIVER | ||
3880 | P: Sathya Perla | ||
3881 | M: sathyap@serverengines.com | ||
3882 | P: Subbu Seetharaman | ||
3883 | M: subbus@serverengines.com | ||
3884 | L: netdev@vger.kernel.org | ||
3885 | W: http://www.serverengines.com | ||
3886 | S: Supported | ||
3887 | |||
3879 | SFC NETWORK DRIVER | 3888 | SFC NETWORK DRIVER |
3880 | P: Steve Hodgson | 3889 | P: Steve Hodgson |
3881 | P: Ben Hutchings | 3890 | P: Ben Hutchings |