diff options
| author | David S. Miller <davem@davemloft.net> | 2009-03-17 18:01:30 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2009-03-17 18:01:30 -0400 |
| commit | 2d6a5e9500103680464a723a4564961675652680 (patch) | |
| tree | d18903333aae8a4415b179d6e7d38f203724892c /MAINTAINERS | |
| parent | bd257ed9f1d129b4e881f513a406b435c8852565 (diff) | |
| parent | f10023a4ef3f5cc05457b059c6880bc447adfa1f (diff) | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts:
drivers/net/igb/igb_main.c
drivers/net/qlge/qlge_main.c
drivers/net/wireless/ath9k/ath9k.h
drivers/net/wireless/ath9k/core.h
drivers/net/wireless/ath9k/hw.c
Diffstat (limited to 'MAINTAINERS')
| -rw-r--r-- | MAINTAINERS | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index 0d9ea2a4e497..27114518eb05 100644 --- a/MAINTAINERS +++ b/MAINTAINERS | |||
| @@ -3888,6 +3888,15 @@ L: linux-ide@vger.kernel.org | |||
| 3888 | T: git kernel.org:/pub/scm/linux/kernel/git/jgarzik/libata-dev.git | 3888 | T: git kernel.org:/pub/scm/linux/kernel/git/jgarzik/libata-dev.git |
| 3889 | S: Supported | 3889 | S: Supported |
| 3890 | 3890 | ||
| 3891 | SERVER ENGINES 10Gbps NIC - BladeEngine 2 DRIVER | ||
| 3892 | P: Sathya Perla | ||
| 3893 | M: sathyap@serverengines.com | ||
| 3894 | P: Subbu Seetharaman | ||
| 3895 | M: subbus@serverengines.com | ||
| 3896 | L: netdev@vger.kernel.org | ||
| 3897 | W: http://www.serverengines.com | ||
| 3898 | S: Supported | ||
| 3899 | |||
| 3891 | SFC NETWORK DRIVER | 3900 | SFC NETWORK DRIVER |
| 3892 | P: Steve Hodgson | 3901 | P: Steve Hodgson |
| 3893 | P: Ben Hutchings | 3902 | P: Ben Hutchings |